diff --git a/Directory.Build.props b/Directory.Build.props
index 71f87094..5a53c72a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -61,7 +61,7 @@
-
+
diff --git a/Packages.props b/Packages.props
index 5df2166c..1bb67c36 100644
--- a/Packages.props
+++ b/Packages.props
@@ -5,19 +5,18 @@
-
+
-
-
-
+
+
+
-
@@ -44,6 +43,7 @@
+
@@ -68,29 +68,31 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
+
diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset
index c4ce0577..cb3ed733 100644
--- a/eng/CodeAnalysis.ruleset
+++ b/eng/CodeAnalysis.ruleset
@@ -1,217 +1,251 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -286,7 +320,7 @@
-
+
@@ -337,8 +371,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/global.json b/global.json
index 44d95934..73862807 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "5.0.100",
+ "dotnet": "5.0.101",
"runtimes": {
"aspnetcore": [
diff --git a/samples/Mvc.Client/Controllers/HomeController.cs b/samples/Mvc.Client/Controllers/HomeController.cs
index c6a9582e..ca426153 100644
--- a/samples/Mvc.Client/Controllers/HomeController.cs
+++ b/samples/Mvc.Client/Controllers/HomeController.cs
@@ -39,7 +39,7 @@ namespace Mvc.Client.Controllers
using var response = await client.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
- return View("Home", model: await response.Content.ReadAsStringAsync());
+ return View("Home", model: await response.Content.ReadAsStringAsync(cancellationToken));
}
}
}
\ No newline at end of file
diff --git a/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs b/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs
index e738efdc..744a3065 100644
--- a/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs
+++ b/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs
@@ -309,7 +309,7 @@ namespace OpenIddict.Server.Tests
var options = GetOptions(services);
// Assert
- Assert.Equal(1, options.SigningCredentials.Count);
+ Assert.Single(options.SigningCredentials);
Assert.Equal(SecurityAlgorithms.RsaSha256, options.SigningCredentials[0].Algorithm);
Assert.NotNull(options.SigningCredentials[0].Kid);
}
@@ -345,7 +345,7 @@ namespace OpenIddict.Server.Tests
var options = GetOptions(services);
// Assert
- Assert.Equal(1, options.SigningCredentials.Count);
+ Assert.Single(options.SigningCredentials);
}
[Theory]