diff --git a/Directory.Packages.props b/Directory.Packages.props index 1f4b736a2..027a55582 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,16 +1,16 @@ - - + + - - - - - - - + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 83ee59743..3a9d475c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ --> 7.0.0 rc - 1 + 2 Release Candidate $(PreReleaseVersionIteration) false release diff --git a/global.json b/global.json index 6e8aae93c..213dfc700 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,12 @@ { "sdk": { - "version": "8.0.100-rc.1.23455.8", + "version": "8.0.100-rc.2.23502.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-rc.1.23455.8" + "dotnet": "8.0.100-rc.2.23502.2" }, "msbuild-sdks": { diff --git a/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs b/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs index c322d4e41..2dd03c8a5 100644 --- a/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs +++ b/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs @@ -72,17 +72,16 @@ await GenerateTokenAsync(Configure, async (context) => securityToken.Payload.ShouldContainKeyAndValue("aud", "https://appleid.apple.com"); securityToken.Payload.ShouldContainKeyAndValue("iss", "my-team-id"); securityToken.Payload.ShouldContainKeyAndValue("sub", "my-client-id"); - securityToken.Payload.Iat.HasValue.ShouldBeTrue(); - securityToken.Payload.Exp.HasValue.ShouldBeTrue(); + securityToken.Payload.Expiration.HasValue.ShouldBeTrue(); securityToken.Payload.Keys.OrderBy((p) => p).ShouldBe( ["aud", "exp", "iat", "iss", "nbf", "sub"], Case.Sensitive, "JWT payload contains unexpected additional claims."); - ((long)securityToken.Payload.Iat!.Value).ShouldBeGreaterThanOrEqualTo(utcNow.ToUnixTimeSeconds()); - ((long)securityToken.Payload.Exp!.Value).ShouldBeGreaterThanOrEqualTo(utcNow.AddSeconds(60).ToUnixTimeSeconds()); - ((long)securityToken.Payload.Exp.Value).ShouldBeLessThanOrEqualTo(utcNow.AddSeconds(70).ToUnixTimeSeconds()); + securityToken.Payload.IssuedAt.ShouldBeGreaterThanOrEqualTo(utcNow.UtcDateTime.AddSeconds(-utcNow.Second)); + ((long)securityToken.Payload.Expiration!.Value).ShouldBeGreaterThanOrEqualTo(utcNow.AddSeconds(60).ToUnixTimeSeconds()); + ((long)securityToken.Payload.Expiration.Value).ShouldBeLessThanOrEqualTo(utcNow.AddSeconds(70).ToUnixTimeSeconds()); }); } diff --git a/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs b/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs index b6ce0c853..15ffbe8b2 100644 --- a/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs +++ b/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleTests.cs @@ -251,7 +251,7 @@ static void ConfigureServices(IServiceCollection services) // Assert exception.InnerException.ShouldNotBeNull(); exception.InnerException.ShouldBeOfType(); - exception.InnerException.InnerException.ShouldBeOfType(); + exception.InnerException.InnerException.ShouldBeOfType(); exception.InnerException.InnerException!.Message.ShouldNotBeNull(); exception.InnerException.InnerException.Message.ShouldStartWith("IDX"); } diff --git a/test/AspNet.Security.OAuth.Providers.Tests/Smartsheet/SmartsheetTests.cs b/test/AspNet.Security.OAuth.Providers.Tests/Smartsheet/SmartsheetTests.cs index 219536b87..fe89bef79 100644 --- a/test/AspNet.Security.OAuth.Providers.Tests/Smartsheet/SmartsheetTests.cs +++ b/test/AspNet.Security.OAuth.Providers.Tests/Smartsheet/SmartsheetTests.cs @@ -5,6 +5,7 @@ */ namespace AspNet.Security.OAuth.Smartsheet; + public class SmartsheetTests(ITestOutputHelper outputHelper) : OAuthTests(outputHelper) { public override string DefaultScheme => SmartsheetAuthenticationDefaults.AuthenticationScheme;