Skip to content

Commit bdc6fbd

Browse files
Update to ASP.NET Core 8 RC 2 (#810)
- Update to RC 2 of ASP.NET Core 8. - Update NuGet packages to their latest versions. - Fix obsolete warnings. - Fix StyleCop warning. - Fix tests after update to Wilson 7.0.0.
1 parent 837fa59 commit bdc6fbd

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

Directory.Packages.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageVersion Include="JetBrains.Annotations" Version="2022.1.0" />
5-
<PackageVersion Include="JustEat.HttpClientInterception" Version="3.1.2" />
4+
<PackageVersion Include="JetBrains.Annotations" Version="2023.2.0" />
5+
<PackageVersion Include="JustEat.HttpClientInterception" Version="4.0.0" />
66
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
7-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0-rc.1.23421.29" />
8-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.1.23421.29" />
9-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-rc.1.23421.29" />
10-
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.16.0" />
11-
<PackageVersion Include="NSubstitute" Version="5.0.0" />
12-
<PackageVersion Include="Shouldly" Version="4.1.0" />
13-
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
7+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0-rc.2.23480.2" />
8+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.2.23480.2" />
9+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-rc.2.23480.2" />
10+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.0" />
11+
<PackageVersion Include="NSubstitute" Version="5.1.0" />
12+
<PackageVersion Include="Shouldly" Version="4.2.1" />
13+
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
1414
</ItemGroup>
1515

1616
</Project>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
-->
1111
<PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">7.0.0</PackageValidationBaselineVersion>
1212
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
13-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
13+
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
1414
<PreReleaseBrandingLabel>Release Candidate $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
1515
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1616
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rc.1.23455.8",
3+
"version": "8.0.100-rc.2.23502.2",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77

88
"tools": {
9-
"dotnet": "8.0.100-rc.1.23455.8"
9+
"dotnet": "8.0.100-rc.2.23502.2"
1010
},
1111

1212
"msbuild-sdks": {

test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,16 @@ await GenerateTokenAsync(Configure, async (context) =>
7272
securityToken.Payload.ShouldContainKeyAndValue("aud", "https://appleid.apple.com");
7373
securityToken.Payload.ShouldContainKeyAndValue("iss", "my-team-id");
7474
securityToken.Payload.ShouldContainKeyAndValue("sub", "my-client-id");
75-
securityToken.Payload.Iat.HasValue.ShouldBeTrue();
76-
securityToken.Payload.Exp.HasValue.ShouldBeTrue();
75+
securityToken.Payload.Expiration.HasValue.ShouldBeTrue();
7776

7877
securityToken.Payload.Keys.OrderBy((p) => p).ShouldBe(
7978
["aud", "exp", "iat", "iss", "nbf", "sub"],
8079
Case.Sensitive,
8180
"JWT payload contains unexpected additional claims.");
8281

83-
((long)securityToken.Payload.Iat!.Value).ShouldBeGreaterThanOrEqualTo(utcNow.ToUnixTimeSeconds());
84-
((long)securityToken.Payload.Exp!.Value).ShouldBeGreaterThanOrEqualTo(utcNow.AddSeconds(60).ToUnixTimeSeconds());
85-
((long)securityToken.Payload.Exp.Value).ShouldBeLessThanOrEqualTo(utcNow.AddSeconds(70).ToUnixTimeSeconds());
82+
securityToken.Payload.IssuedAt.ShouldBeGreaterThanOrEqualTo(utcNow.UtcDateTime.AddSeconds(-utcNow.Second));
83+
((long)securityToken.Payload.Expiration!.Value).ShouldBeGreaterThanOrEqualTo(utcNow.AddSeconds(60).ToUnixTimeSeconds());
84+
((long)securityToken.Payload.Expiration.Value).ShouldBeLessThanOrEqualTo(utcNow.AddSeconds(70).ToUnixTimeSeconds());
8685
});
8786
}
8887

test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ static void ConfigureServices(IServiceCollection services)
251251
// Assert
252252
exception.InnerException.ShouldNotBeNull();
253253
exception.InnerException.ShouldBeOfType<SecurityTokenValidationException>();
254-
exception.InnerException.InnerException.ShouldBeOfType<ArgumentException>();
254+
exception.InnerException.InnerException.ShouldBeOfType<SecurityTokenMalformedException>();
255255
exception.InnerException.InnerException!.Message.ShouldNotBeNull();
256256
exception.InnerException.InnerException.Message.ShouldStartWith("IDX");
257257
}

test/AspNet.Security.OAuth.Providers.Tests/Smartsheet/SmartsheetTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
namespace AspNet.Security.OAuth.Smartsheet;
8+
89
public class SmartsheetTests(ITestOutputHelper outputHelper) : OAuthTests<SmartsheetAuthenticationOptions>(outputHelper)
910
{
1011
public override string DefaultScheme => SmartsheetAuthenticationDefaults.AuthenticationScheme;

0 commit comments

Comments
 (0)