From acec3acc50c2179092351b689b5bba26d60c9c52 Mon Sep 17 00:00:00 2001 From: martincostello Date: Mon, 11 Sep 2023 13:03:46 +0100 Subject: [PATCH 1/4] Update to ASP.NET Core 8 RC 1 Update to release candidate 1 of ASP.NET Core 8. --- Directory.Packages.props | 6 +++--- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 547d1cfa9..1f4b736a2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,9 +4,9 @@ - - - + + + diff --git a/eng/Versions.props b/eng/Versions.props index f0f2a22aa..af523e83c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,9 +9,9 @@ TODO Change to 8.0.0 post-release --> 7.0.0 - preview - 7 - Preview $(PreReleaseVersionIteration) + rc + 1 + RC $(PreReleaseVersionIteration) false release true diff --git a/global.json b/global.json index 97da5baae..ce9c5c2c5 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,12 @@ { "sdk": { - "version": "8.0.100-preview.7.23376.3", + "version": "8.0.100-rc.1.23455.8", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-preview.7.23376.3" + "dotnet": "8.0.100-rc.1.23455.8" }, "msbuild-sdks": { From 1febfafc13467c29c45651083654ecefdae8a24f Mon Sep 17 00:00:00 2001 From: martincostello Date: Mon, 11 Sep 2023 13:09:19 +0100 Subject: [PATCH 2/4] Fix PreReleaseBrandingLabel Use full term, not abbreviation, to match ASP.NET Core. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index af523e83c..83ee59743 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 7.0.0 rc 1 - RC $(PreReleaseVersionIteration) + Release Candidate $(PreReleaseVersionIteration) false release true From a8a109579870a20afcbda2f3223f94acfc11455f Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Tue, 12 Sep 2023 17:26:51 +0100 Subject: [PATCH 3/4] Fix CA1508 warning Remove redundant null check. --- .../Internal/DefaultAppleClientSecretGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspNet.Security.OAuth.Apple/Internal/DefaultAppleClientSecretGenerator.cs b/src/AspNet.Security.OAuth.Apple/Internal/DefaultAppleClientSecretGenerator.cs index d13660e78..8c0a4a394 100644 --- a/src/AspNet.Security.OAuth.Apple/Internal/DefaultAppleClientSecretGenerator.cs +++ b/src/AspNet.Security.OAuth.Apple/Internal/DefaultAppleClientSecretGenerator.cs @@ -109,7 +109,7 @@ private static ECDsa CreateAlgorithm(ReadOnlyMemory pem) } catch (Exception) { - algorithm?.Dispose(); + algorithm.Dispose(); throw; } } From c0cdba6946fa3259b0259f22b278ec34828fc54b Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Tue, 12 Sep 2023 17:34:29 +0100 Subject: [PATCH 4/4] Fix CA1869 warning Fix CA1869 warning for creating multiple serializer options. --- .../AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs b/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs index 0aa22df7d..2e02a4251 100644 --- a/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs +++ b/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs @@ -16,6 +16,8 @@ namespace AspNet.Security.OAuth.Apple; public class AppleTests : OAuthTests { + private static readonly JsonSerializerOptions SerializerOptions = new() { WriteIndented = true }; + public AppleTests(ITestOutputHelper outputHelper) { OutputHelper = outputHelper; @@ -533,7 +535,7 @@ public void Regenerate_Test_Jwts() var publicEmailIdToken = new JwtSecurityTokenHandler().WriteToken(publicEmailToken); var privateEmailIdToken = new JwtSecurityTokenHandler().WriteToken(privateEmailToken); - var serializedRsaPublicKey = JsonSerializer.Serialize(webKey, new JsonSerializerOptions() { WriteIndented = true }); + var serializedRsaPublicKey = JsonSerializer.Serialize(webKey, SerializerOptions); // Copy the values from the test output to bundles.json if you need to regenerate the JWTs to edit the claims