Replace FluentAssertions with Shouldly

Directory.Packages.props

@@ -35,7 +35,6 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="Duende.IdentityModel" Version="7.0.0" />
     <PackageVersion Include="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersion)" />
@@ -58,9 +57,14 @@
     <PackageVersion Include="SimpleExec" Version="12.0.0" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="$(WilsonVersion)" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(WilsonVersion)" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="Verify.Xunit" Version="27.0.1" />
     <PackageVersion Include="xunit.core" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
+
+  </ItemGroup>
 </Project>

access-token-management/src/AccessTokenManagement.OpenIdConnect/AuthenticateResultCache.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Microsoft.AspNetCore.Authentication;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Authentication;
 /// <summary>
 /// Per-request cache so that if SignInAsync is used, we won't re-read the old/cached AuthenticateResult from the handler.
 /// This requires this service to be added as scoped to the DI system.

access-token-management/src/AccessTokenManagement.OpenIdConnect/AuthenticationSessionUserTokenStore.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
-using System.Security.Claims;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Duende.AccessTokenManagement.OpenIdConnect
 {

access-token-management/src/AccessTokenManagement.OpenIdConnect/AuthorizationServerDPoPHandler.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Net;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using System.Net;
 
 namespace Duende.AccessTokenManagement.OpenIdConnect;
 

access-token-management/src/AccessTokenManagement.OpenIdConnect/BlazorServerPrincipalAccessor.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Security.Claims;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System.Security.Claims;
 
 namespace Duende.AccessTokenManagement.OpenIdConnect;
 

access-token-management/src/AccessTokenManagement.OpenIdConnect/HttpContextPrincipalAccessor.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Microsoft.AspNetCore.Http;
 using System.Security.Claims;
+using Microsoft.AspNetCore.Http;
 
 namespace Duende.AccessTokenManagement.OpenIdConnect;
 

access-token-management/src/AccessTokenManagement.OpenIdConnect/TokenManagementHttpContextExtensions.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using Duende.AccessTokenManagement;
 using Duende.AccessTokenManagement.OpenIdConnect;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Authentication;

access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Duende.IdentityModel.Client;
 using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs

@@ -1,13 +1,13 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Duende.IdentityModel;
-using Microsoft.IdentityModel.Tokens;
-using System.Text;
 using System.Security.Cryptography;
+using System.Text;
 using System.Text.Json;
-using Microsoft.IdentityModel.JsonWebTokens;
+using Duende.IdentityModel;
 using Microsoft.Extensions.Logging;
+using Microsoft.IdentityModel.JsonWebTokens;
+using Microsoft.IdentityModel.Tokens;
 
 namespace Duende.AccessTokenManagement;
 

access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs

@@ -1,13 +1,13 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Duende.IdentityServer.Configuration;
+using System.Text.Json;
 using Duende.IdentityModel;
+using Duende.IdentityServer.Configuration;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using System.Text.Json;
 
 namespace Duende.AccessTokenManagement.Tests;
 

access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs

@@ -1,16 +1,16 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Net;
+using System.Net.Http.Json;
+using System.Web;
+using Duende.AccessTokenManagement.OpenIdConnect;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using System.Net;
-using System.Web;
-using Duende.IdentityModel;
-using Duende.AccessTokenManagement.OpenIdConnect;
 using RichardSzalay.MockHttp;
-using System.Net.Http.Json;
 
 namespace Duende.AccessTokenManagement.Tests;
 

access-token-management/test/AccessTokenManagement.Tests/Framework/GenericHost.cs

@@ -1,16 +1,16 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Net;
+using System.Reflection;
+using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using System.Net;
-using System.Reflection;
-using System.Security.Claims;
 
 namespace Duende.AccessTokenManagement.Tests;
 

access-token-management/test/AccessTokenManagement.Tests/Framework/IdentityServerHost.cs

@@ -1,13 +1,13 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Security.Claims;
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System.Security.Claims;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;
 

access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Security.Claims;
 using Duende.AccessTokenManagement.OpenIdConnect;
-using Duende.IdentityServer.Models;
 using Duende.IdentityModel;
-using System.Security.Claims;
+using Duende.IdentityServer.Models;
 
 namespace Duende.AccessTokenManagement.Tests;
 

access-token-management/test/AccessTokenManagement.Tests/Usings.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-global using Xunit;
-global using Shouldly;
+global using Shouldly;
+global using Xunit;

identity-model-oidc-client/clients/ConsoleClientWithBrowser/Program.cs

@@ -1,20 +1,20 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Serilog;
 using System;
 using System.Collections.Generic;
+using System.IdentityModel.Tokens.Jwt;
 using System.Net.Http;
+using System.Security.Claims;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Serilog.Sinks.SystemConsole.Themes;
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using Duende.IdentityModel.OidcClient;
 using Duende.IdentityModel;
-using Microsoft.IdentityModel.Tokens;
 using Duende.IdentityModel.Client;
+using Duende.IdentityModel.OidcClient;
+using Microsoft.Extensions.Logging;
+using Microsoft.IdentityModel.Tokens;
+using Serilog;
+using Serilog.Sinks.SystemConsole.Themes;
 
 namespace ConsoleClientWithBrowser
 {

identity-model-oidc-client/clients/ConsoleClientWithBrowser/SystemBrowser.cs

@@ -1,9 +1,6 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using System;
 using System.Diagnostics;
 using System.Net;
@@ -12,6 +9,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Duende.IdentityModel.OidcClient.Browser;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 
 namespace ConsoleClientWithBrowser
 {

identity-model-oidc-client/clients/ConsoleClientWithBrowserAndDPoP/Program.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Serilog;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -10,8 +9,9 @@
 using System.Threading.Tasks;
 using Duende.IdentityModel.OidcClient;
 using Duende.IdentityModel.OidcClient.DPoP;
-using Serilog.Sinks.SystemConsole.Themes;
 using Microsoft.Extensions.Logging;
+using Serilog;
+using Serilog.Sinks.SystemConsole.Themes;
 
 namespace ConsoleClientWithBrowserAndDPoP
 {

identity-model-oidc-client/clients/ConsoleClientWithBrowserAndDPoP/SystemBrowser.cs

@@ -1,9 +1,6 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using System;
 using System.Diagnostics;
 using System.Net;
@@ -12,6 +9,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Duende.IdentityModel.OidcClient.Browser;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 
 namespace ConsoleClientWithBrowserAndDPoP
 {

identity-model-oidc-client/src/IdentityModel.OidcClient/AuthorizeClient.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Duende.IdentityModel.OidcClient.Browser;
 using Duende.IdentityModel.OidcClient.Infrastructure;
 using Duende.IdentityModel.OidcClient.Results;
-using Duende.IdentityModel;
-using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Logging;
 
 namespace Duende.IdentityModel.OidcClient

identity-model-oidc-client/src/IdentityModel.OidcClient/AuthorizeRequest.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Duende.IdentityModel.OidcClient.Browser;
 using Duende.IdentityModel.Client;
+using Duende.IdentityModel.OidcClient.Browser;
 
 namespace Duende.IdentityModel.OidcClient
 {

identity-model-oidc-client/src/IdentityModel.OidcClient/LoginRequest.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Duende.IdentityModel.OidcClient.Browser;
 using Duende.IdentityModel.Client;
+using Duende.IdentityModel.OidcClient.Browser;
 
 namespace Duende.IdentityModel.OidcClient
 {

identity-model-oidc-client/src/IdentityModel.OidcClient/NoValidationIdentityTokenValidator.cs

@@ -4,8 +4,8 @@
 using System.Security.Claims;
 using System.Text;
 using System.Text.Json;
-using Duende.IdentityModel.OidcClient.Results;
 using Duende.IdentityModel;
+using Duende.IdentityModel.OidcClient.Results;
 
 namespace Duende.IdentityModel.OidcClient
 {

identity-model-oidc-client/src/IdentityModel.OidcClient/OidcClient.cs

@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using System.Security.Claims;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Duende.IdentityModel.OidcClient.Browser;
 using Duende.IdentityModel.OidcClient.Infrastructure;
 using Duende.IdentityModel.OidcClient.Results;
-using Duende.IdentityModel;
-using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Logging;
 
 namespace Duende.IdentityModel.OidcClient

identity-model-oidc-client/src/IdentityModel.OidcClient/OidcClientOptions.cs

@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using System.Text.Json.Serialization;
-using Duende.IdentityModel.OidcClient.Browser;
 using Duende.IdentityModel;
 using Duende.IdentityModel.Client;
+using Duende.IdentityModel.OidcClient.Browser;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 

identity-model-oidc-client/src/IdentityModel.OidcClient/ProviderInformation.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Duende.IdentityModel.OidcClient.Infrastructure;
 using Duende.IdentityModel.Jwk;
+using Duende.IdentityModel.OidcClient.Infrastructure;
 
 namespace Duende.IdentityModel.OidcClient
 {

identity-model-oidc-client/src/IdentityModel.OidcClient/ResponseProcessor.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using System.Net;
-using Duende.IdentityModel.OidcClient.Infrastructure;
-using Duende.IdentityModel.OidcClient.Results;
 using Duende.IdentityModel;
 using Duende.IdentityModel.Client;
+using Duende.IdentityModel.OidcClient.Infrastructure;
+using Duende.IdentityModel.OidcClient.Results;
 using Microsoft.Extensions.Logging;
 
 namespace Duende.IdentityModel.OidcClient