diff --git a/Directory.Build.targets b/Directory.Build.targets index f6ea513e..d7730b74 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,10 +1,10 @@ 8.0.0 - 8.0.8 - 7.1.2 + 8.0.11 + 8.0.1 2.1.0 - 7.0.6 + 7.1.0-preview.1 @@ -13,9 +13,10 @@ - - - + + + + @@ -24,7 +25,7 @@ - + @@ -38,14 +39,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Duende.Bff.v3.ncrunchsolution b/Duende.Bff.v3.ncrunchsolution new file mode 100644 index 00000000..13107d39 --- /dev/null +++ b/Duende.Bff.v3.ncrunchsolution @@ -0,0 +1,8 @@ + + + True + True + True + True + + \ No newline at end of file diff --git a/migrations/UserSessionDb/UserSessionDb.csproj b/migrations/UserSessionDb/UserSessionDb.csproj index 6cdf5313..f6078340 100644 --- a/migrations/UserSessionDb/UserSessionDb.csproj +++ b/migrations/UserSessionDb/UserSessionDb.csproj @@ -9,8 +9,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/samples/Apis/Api.DPoP/Api.DPoP.csproj b/samples/Apis/Api.DPoP/Api.DPoP.csproj index 211a51f5..c0ecfb4c 100644 --- a/samples/Apis/Api.DPoP/Api.DPoP.csproj +++ b/samples/Apis/Api.DPoP/Api.DPoP.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/Apis/Api.DPoP/DPoP/DPoPExtensions.cs b/samples/Apis/Api.DPoP/DPoP/DPoPExtensions.cs index 2f45db4c..ec7eaed1 100644 --- a/samples/Apis/Api.DPoP/DPoP/DPoPExtensions.cs +++ b/samples/Apis/Api.DPoP/DPoP/DPoPExtensions.cs @@ -1,4 +1,4 @@ -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.IdentityModel.Tokens; diff --git a/samples/Apis/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs b/samples/Apis/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs index 928c8e09..0925758f 100644 --- a/samples/Apis/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs +++ b/samples/Apis/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs @@ -1,11 +1,11 @@ -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; using System.Text; using System.Threading.Tasks; -using static IdentityModel.OidcConstants; +using static Duende.IdentityModel.OidcConstants; namespace Api.DPoP; diff --git a/samples/Apis/Api.DPoP/DPoP/DPoPProofValidator.cs b/samples/Apis/Api.DPoP/DPoP/DPoPProofValidator.cs index ef41c6df..eec53a55 100644 --- a/samples/Apis/Api.DPoP/DPoP/DPoPProofValidator.cs +++ b/samples/Apis/Api.DPoP/DPoP/DPoPProofValidator.cs @@ -1,4 +1,4 @@ -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/samples/Apis/Api.Isolated/Api.Isolated.csproj b/samples/Apis/Api.Isolated/Api.Isolated.csproj index 211a51f5..c0ecfb4c 100644 --- a/samples/Apis/Api.Isolated/Api.Isolated.csproj +++ b/samples/Apis/Api.Isolated/Api.Isolated.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/Apis/Api/Api.csproj b/samples/Apis/Api/Api.csproj index 211a51f5..c0ecfb4c 100644 --- a/samples/Apis/Api/Api.csproj +++ b/samples/Apis/Api/Api.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/IdentityServer/Config.cs b/samples/IdentityServer/Config.cs index ae479b72..9284eefb 100644 --- a/samples/IdentityServer/Config.cs +++ b/samples/IdentityServer/Config.cs @@ -3,7 +3,7 @@ using Duende.IdentityServer.Models; -using IdentityModel; +using Duende.IdentityModel; namespace IdentityServerHost { diff --git a/samples/IdentityServer/IdentityServer.csproj b/samples/IdentityServer/IdentityServer.csproj index ebd4c789..cada84c3 100644 --- a/samples/IdentityServer/IdentityServer.csproj +++ b/samples/IdentityServer/IdentityServer.csproj @@ -7,6 +7,7 @@ + diff --git a/samples/IdentityServer/Pages/Account/Logout/Index.cshtml.cs b/samples/IdentityServer/Pages/Account/Logout/Index.cshtml.cs index 659969d3..09a8d9c1 100644 --- a/samples/IdentityServer/Pages/Account/Logout/Index.cshtml.cs +++ b/samples/IdentityServer/Pages/Account/Logout/Index.cshtml.cs @@ -1,7 +1,7 @@ using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/samples/IdentityServer/Pages/Consent/Index.cshtml.cs b/samples/IdentityServer/Pages/Consent/Index.cshtml.cs index 371e5863..1f6167be 100644 --- a/samples/IdentityServer/Pages/Consent/Index.cshtml.cs +++ b/samples/IdentityServer/Pages/Consent/Index.cshtml.cs @@ -3,7 +3,7 @@ using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/samples/IdentityServer/Pages/Diagnostics/ViewModel.cs b/samples/IdentityServer/Pages/Diagnostics/ViewModel.cs index e5eed0cd..b349a08f 100644 --- a/samples/IdentityServer/Pages/Diagnostics/ViewModel.cs +++ b/samples/IdentityServer/Pages/Diagnostics/ViewModel.cs @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; diff --git a/samples/IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs b/samples/IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs index 1433d3e0..b9243bce 100644 --- a/samples/IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs +++ b/samples/IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs @@ -3,7 +3,7 @@ using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/samples/IdentityServer/Pages/TestUsers.cs b/samples/IdentityServer/Pages/TestUsers.cs index c5f70da5..798a3e66 100644 --- a/samples/IdentityServer/Pages/TestUsers.cs +++ b/samples/IdentityServer/Pages/TestUsers.cs @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. -using IdentityModel; +using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; using Duende.IdentityServer; diff --git a/samples/IdentityServer/TokenExchangeGrantValidator.cs b/samples/IdentityServer/TokenExchangeGrantValidator.cs index cbfc0f04..a86bb90f 100644 --- a/samples/IdentityServer/TokenExchangeGrantValidator.cs +++ b/samples/IdentityServer/TokenExchangeGrantValidator.cs @@ -1,6 +1,6 @@ using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using IdentityModel; +using Duende.IdentityModel; namespace IdentityServerHost; diff --git a/samples/JS8.EF/JS8.EF.csproj b/samples/JS8.EF/JS8.EF.csproj index 0d2a1a62..f5917ddc 100644 --- a/samples/JS8.EF/JS8.EF.csproj +++ b/samples/JS8.EF/JS8.EF.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/samples/JS8/ImpersonationAccessTokenRetriever.cs b/samples/JS8/ImpersonationAccessTokenRetriever.cs index 1f009bbf..407a6f6a 100644 --- a/samples/JS8/ImpersonationAccessTokenRetriever.cs +++ b/samples/JS8/ImpersonationAccessTokenRetriever.cs @@ -4,8 +4,8 @@ using System.Net.Http; using System.Threading.Tasks; using Duende.Bff; -using IdentityModel; -using IdentityModel.Client; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; using Microsoft.Extensions.Logging; namespace Host8; diff --git a/src/Duende.Bff.Blazor.Client/Duende.Bff.Blazor.Client.csproj b/src/Duende.Bff.Blazor.Client/Duende.Bff.Blazor.Client.csproj index 08c1ea69..a3da2a6a 100644 --- a/src/Duende.Bff.Blazor.Client/Duende.Bff.Blazor.Client.csproj +++ b/src/Duende.Bff.Blazor.Client/Duende.Bff.Blazor.Client.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Duende.Bff.Blazor/BffServerAuthenticationStateProvider.cs b/src/Duende.Bff.Blazor/BffServerAuthenticationStateProvider.cs index 3e7549dc..a2e4f69a 100644 --- a/src/Duende.Bff.Blazor/BffServerAuthenticationStateProvider.cs +++ b/src/Duende.Bff.Blazor/BffServerAuthenticationStateProvider.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Security.Claims; using Duende.Bff.Blazor.Client; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Components.Server; diff --git a/src/Duende.Bff.Yarp/AccessTokenRequestTransform.cs b/src/Duende.Bff.Yarp/AccessTokenRequestTransform.cs index 5bb346c5..1cc8c4dd 100644 --- a/src/Duende.Bff.Yarp/AccessTokenRequestTransform.cs +++ b/src/Duende.Bff.Yarp/AccessTokenRequestTransform.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Duende.AccessTokenManagement; using Duende.Bff.Logging; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.Extensions.Logging; using Yarp.ReverseProxy.Transforms; diff --git a/src/Duende.Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs b/src/Duende.Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs index e4f9c38f..c45ebad5 100644 --- a/src/Duende.Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs +++ b/src/Duende.Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs @@ -1,7 +1,7 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Http; diff --git a/src/Duende.Bff/EndpointServices/Logout/DefaultLogoutService.cs b/src/Duende.Bff/EndpointServices/Logout/DefaultLogoutService.cs index 49d9ace7..3d4ec726 100644 --- a/src/Duende.Bff/EndpointServices/Logout/DefaultLogoutService.cs +++ b/src/Duende.Bff/EndpointServices/Logout/DefaultLogoutService.cs @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. using Duende.AccessTokenManagement.OpenIdConnect; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/src/Duende.Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs b/src/Duende.Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs index e29f274d..b652f757 100644 --- a/src/Duende.Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs +++ b/src/Duende.Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs @@ -1,7 +1,7 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/src/Duende.Bff/EndpointServices/User/DefaultClaimsService.cs b/src/Duende.Bff/EndpointServices/User/DefaultClaimsService.cs index 6b8b302f..7477b0dc 100644 --- a/src/Duende.Bff/EndpointServices/User/DefaultClaimsService.cs +++ b/src/Duende.Bff/EndpointServices/User/DefaultClaimsService.cs @@ -1,7 +1,7 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.IdentityModel.Protocols.OpenIdConnect; diff --git a/src/Duende.Bff/Extensions/AuthenticationTicketExtensions.cs b/src/Duende.Bff/Extensions/AuthenticationTicketExtensions.cs index 6511c18c..d8b51446 100644 --- a/src/Duende.Bff/Extensions/AuthenticationTicketExtensions.cs +++ b/src/Duende.Bff/Extensions/AuthenticationTicketExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; diff --git a/src/Duende.Bff/Extensions/HttpContextExtensions.cs b/src/Duende.Bff/Extensions/HttpContextExtensions.cs index d77d90f9..ceaeaa4e 100644 --- a/src/Duende.Bff/Extensions/HttpContextExtensions.cs +++ b/src/Duende.Bff/Extensions/HttpContextExtensions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Duende.AccessTokenManagement; using Duende.AccessTokenManagement.OpenIdConnect; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; diff --git a/src/Duende.Bff/General/DefaultAccessTokenRetriever.cs b/src/Duende.Bff/General/DefaultAccessTokenRetriever.cs index 6f0568de..9b93e987 100644 --- a/src/Duende.Bff/General/DefaultAccessTokenRetriever.cs +++ b/src/Duende.Bff/General/DefaultAccessTokenRetriever.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; using Duende.Bff.Logging; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; diff --git a/src/Duende.Bff/SessionManagement/Configuration/PostConfigureApplicationCookieRevokeRefreshToken.cs b/src/Duende.Bff/SessionManagement/Configuration/PostConfigureApplicationCookieRevokeRefreshToken.cs index cb0ea410..8087ae9b 100644 --- a/src/Duende.Bff/SessionManagement/Configuration/PostConfigureApplicationCookieRevokeRefreshToken.cs +++ b/src/Duende.Bff/SessionManagement/Configuration/PostConfigureApplicationCookieRevokeRefreshToken.cs @@ -1,7 +1,7 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.Extensions.Logging; diff --git a/src/Duende.Bff/SessionManagement/TicketStore/ServerSideTicketStore.cs b/src/Duende.Bff/SessionManagement/TicketStore/ServerSideTicketStore.cs index b03d236d..01c14eb6 100644 --- a/src/Duende.Bff/SessionManagement/TicketStore/ServerSideTicketStore.cs +++ b/src/Duende.Bff/SessionManagement/TicketStore/ServerSideTicketStore.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; diff --git a/test/Duende.Bff.Blazor.Client.UnitTests/Duende.Bff.Blazor.Client.UnitTests.csproj b/test/Duende.Bff.Blazor.Client.UnitTests/Duende.Bff.Blazor.Client.UnitTests.csproj index 5626771b..655aba15 100644 --- a/test/Duende.Bff.Blazor.Client.UnitTests/Duende.Bff.Blazor.Client.UnitTests.csproj +++ b/test/Duende.Bff.Blazor.Client.UnitTests/Duende.Bff.Blazor.Client.UnitTests.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -12,11 +12,11 @@ - + - - + + diff --git a/test/Duende.Bff.Blazor.UnitTests/Duende.Bff.Blazor.UnitTests.csproj b/test/Duende.Bff.Blazor.UnitTests/Duende.Bff.Blazor.UnitTests.csproj index 2c104e3d..a3931e32 100644 --- a/test/Duende.Bff.Blazor.UnitTests/Duende.Bff.Blazor.UnitTests.csproj +++ b/test/Duende.Bff.Blazor.UnitTests/Duende.Bff.Blazor.UnitTests.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -10,12 +10,12 @@ - - + + - - + + diff --git a/test/Duende.Bff.Tests/Endpoints/RemoteEndpointTests.cs b/test/Duende.Bff.Tests/Endpoints/RemoteEndpointTests.cs index 92bff8dc..ae5015f7 100644 --- a/test/Duende.Bff.Tests/Endpoints/RemoteEndpointTests.cs +++ b/test/Duende.Bff.Tests/Endpoints/RemoteEndpointTests.cs @@ -393,7 +393,7 @@ public async Task test_dpop() opts.DPoPJsonWebKey = jwk; }); }; - BffHost.InitializeAsync().Wait(); + await BffHost.InitializeAsync(); var req = new HttpRequestMessage(HttpMethod.Get, BffHost.Url("/api_client/test")); req.Headers.Add("x-csrf", "1"); diff --git a/test/Duende.Bff.Tests/TestHosts/IdentityServerHost.cs b/test/Duende.Bff.Tests/TestHosts/IdentityServerHost.cs index 94e04547..58668bf4 100644 --- a/test/Duende.Bff.Tests/TestHosts/IdentityServerHost.cs +++ b/test/Duende.Bff.Tests/TestHosts/IdentityServerHost.cs @@ -6,7 +6,7 @@ using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using IdentityModel; +using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection;