Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to ASP.NET Core 8 RC 1 #801

Merged
merged 4 commits into from
Sep 12, 2023
Merged

Update to ASP.NET Core 8 RC 1 #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acec3ac
Update to ASP.NET Core 8 RC 1
martincostello Sep 11, 2023
1febfaf
Fix PreReleaseBrandingLabel
martincostello Sep 11, 2023
a8a1095
Fix CA1508 warning
martincostello Sep 12, 2023
c0cdba6
Fix CA1869 warning
martincostello Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<PackageVersion Include="JetBrains.Annotations" Version="2022.1.0" />
<PackageVersion Include="JustEat.HttpClientInterception" Version="3.1.2" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0-preview.7.23375.9" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.7.23375.9" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.7.23375.9" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0-rc.1.23421.29" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.1.23421.29" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-rc.1.23421.29" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.16.0" />
<PackageVersion Include="NSubstitute" Version="5.0.0" />
<PackageVersion Include="Shouldly" Version="4.1.0" />
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
TODO Change to 8.0.0 post-release
-->
<PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">7.0.0</PackageValidationBaselineVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>7</PreReleaseVersionIteration>
<PreReleaseBrandingLabel>Preview $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<PreReleaseBrandingLabel>Release Candidate $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/AspNet.Security.OAuth.Apple/Internal/DefaultAppleClientSecretGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private static ECDsa CreateAlgorithm(ReadOnlyMemory<char> pem)
}
catch (Exception)
{
algorithm?.Dispose();
algorithm.Dispose();
throw;
}
}
Expand Down
4 changes: 3 additions & 1 deletion test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ namespace AspNet.Security.OAuth.Apple;

public class AppleTests : OAuthTests<AppleAuthenticationOptions>
{
private static readonly JsonSerializerOptions SerializerOptions = new() { WriteIndented = true };

public AppleTests(ITestOutputHelper outputHelper)
{
OutputHelper = outputHelper;
Expand Down Expand Up @@ -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

Expand Down