Update to ASP.NET Core 8 preview 5 (#150)

martincostello · web-flow · commit 29e9cb41abb5 · 2023-06-14T07:36:32.000+01:00
- Update to preview 5 of ASP.NET Core 8.
- Remove now-obsolete use of `ISystemClock`.
- Fix code analysis warning by using `TryGetValue()`.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,11 +5,11 @@
     <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.Mvc.Testing" Version="8.0.0-preview.4.23260.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.4.23260.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.5.23302.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.5.23302.2" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.10.0" />
     <PackageVersion Include="Shouldly" Version="4.1.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.0-preview.4.23259.5" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.0-preview.5.23280.8" />
   </ItemGroup>
 
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -7,7 +7,7 @@
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>3</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>5</PreReleaseVersionIteration>
     <PreReleaseBrandingLabel>Preview $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
diff --git a/global.json b/global.json
@@ -1,10 +1,10 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.4.23260.5"
+    "version": "8.0.100-preview.5.23303.2"
   },
 
   "tools": {
-    "dotnet": "8.0.100-preview.4.23260.5"
+    "dotnet": "8.0.100-preview.5.23303.2"
   },
 
   "msbuild-sdks": {
diff --git a/src/AspNet.Security.OpenId.Steam/SteamAuthenticationHandler.cs b/src/AspNet.Security.OpenId.Steam/SteamAuthenticationHandler.cs
@@ -20,9 +20,8 @@ public partial class SteamAuthenticationHandler : OpenIdAuthenticationHandler<St
     public SteamAuthenticationHandler(
         [NotNull] IOptionsMonitor<SteamAuthenticationOptions> options,
         [NotNull] ILoggerFactory logger,
-        [NotNull] UrlEncoder encoder,
-        [NotNull] ISystemClock clock)
-        : base(options, logger, encoder, clock)
+        [NotNull] UrlEncoder encoder)
+        : base(options, logger, encoder)
     {
     }
 
diff --git a/src/AspNet.Security.OpenId/OpenIdAuthenticationHandler.cs b/src/AspNet.Security.OpenId/OpenIdAuthenticationHandler.cs
@@ -19,9 +19,8 @@ public class OpenIdAuthenticationHandler : OpenIdAuthenticationHandler<OpenIdAut
     public OpenIdAuthenticationHandler(
         [NotNull] IOptionsMonitor<OpenIdAuthenticationOptions> options,
         [NotNull] ILoggerFactory logger,
-        [NotNull] UrlEncoder encoder,
-        [NotNull] ISystemClock clock)
-        : base(options, logger, encoder, clock)
+        [NotNull] UrlEncoder encoder)
+        : base(options, logger, encoder)
     {
     }
 }
@@ -32,9 +31,8 @@ public partial class OpenIdAuthenticationHandler<TOptions> : RemoteAuthenticatio
     public OpenIdAuthenticationHandler(
         [NotNull] IOptionsMonitor<TOptions> options,
         [NotNull] ILoggerFactory logger,
-        [NotNull] UrlEncoder encoder,
-        [NotNull] ISystemClock clock)
-        : base(options, logger, encoder, clock)
+        [NotNull] UrlEncoder encoder)
+        : base(options, logger, encoder)
     {
     }
 
@@ -419,14 +417,14 @@ private async Task<bool> VerifyAssertionAsync([NotNull] OpenIdAuthenticationMess
 
             // Stop processing the assertion if the mandatory is_valid
             // parameter was missing from the response body.
-            if (!parameters.ContainsKey(OpenIdAuthenticationConstants.Parameters.IsValid))
+            if (!parameters.TryGetValue(OpenIdAuthenticationConstants.Parameters.IsValid, out var isValid))
             {
                 Log.InvalidCheckAuthenticationResponse(Logger);
                 return false;
             }
 
             // Stop processing the assertion if the authentication server declared it as invalid.
-            if (!string.Equals(parameters[OpenIdAuthenticationConstants.Parameters.IsValid], "true", StringComparison.Ordinal))
+            if (!string.Equals(isValid, "true", StringComparison.Ordinal))
             {
                 Log.InvalidSecurityAssertion(Logger);
                 return false;

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,8 @@ public partial class SteamAuthenticationHandler : OpenIdAuthenticationHandler<St`
`20`	`20`	`public SteamAuthenticationHandler(`
`21`	`21`	`[NotNull] IOptionsMonitor<SteamAuthenticationOptions> options,`
`22`	`22`	`[NotNull] ILoggerFactory logger,`
`23`		`- [NotNull] UrlEncoder encoder,`
`24`		`- [NotNull] ISystemClock clock)`
`25`		`- : base(options, logger, encoder, clock)`
	`23`	`+ [NotNull] UrlEncoder encoder)`
	`24`	`+ : base(options, logger, encoder)`
`26`	`25`	`{`
`27`	`26`	`}`
`28`	`27`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,8 @@ public class OpenIdAuthenticationHandler : OpenIdAuthenticationHandler<OpenIdAut`
`19`	`19`	`public OpenIdAuthenticationHandler(`
`20`	`20`	`[NotNull] IOptionsMonitor<OpenIdAuthenticationOptions> options,`
`21`	`21`	`[NotNull] ILoggerFactory logger,`
`22`		`- [NotNull] UrlEncoder encoder,`
`23`		`- [NotNull] ISystemClock clock)`
`24`		`- : base(options, logger, encoder, clock)`
	`22`	`+ [NotNull] UrlEncoder encoder)`
	`23`	`+ : base(options, logger, encoder)`
`25`	`24`	`{`
`26`	`25`	`}`
`27`	`26`	`}`
`@@ -32,9 +31,8 @@ public partial class OpenIdAuthenticationHandler<TOptions> : RemoteAuthenticatio`
`32`	`31`	`public OpenIdAuthenticationHandler(`
`33`	`32`	`[NotNull] IOptionsMonitor<TOptions> options,`
`34`	`33`	`[NotNull] ILoggerFactory logger,`
`35`		`- [NotNull] UrlEncoder encoder,`
`36`		`- [NotNull] ISystemClock clock)`
`37`		`- : base(options, logger, encoder, clock)`
	`34`	`+ [NotNull] UrlEncoder encoder)`
	`35`	`+ : base(options, logger, encoder)`
`38`	`36`	`{`
`39`	`37`	`}`
`40`	`38`
`@@ -419,14 +417,14 @@ private async Task<bool> VerifyAssertionAsync([NotNull] OpenIdAuthenticationMess`
`419`	`417`
`420`	`418`	`// Stop processing the assertion if the mandatory is_valid`
`421`	`419`	`// parameter was missing from the response body.`
`422`		`- if (!parameters.ContainsKey(OpenIdAuthenticationConstants.Parameters.IsValid))`
	`420`	`+ if (!parameters.TryGetValue(OpenIdAuthenticationConstants.Parameters.IsValid, out var isValid))`
`423`	`421`	`{`
`424`	`422`	`Log.InvalidCheckAuthenticationResponse(Logger);`
`425`	`423`	`return false;`
`426`	`424`	`}`
`427`	`425`
`428`	`426`	`// Stop processing the assertion if the authentication server declared it as invalid.`
`429`		`- if (!string.Equals(parameters[OpenIdAuthenticationConstants.Parameters.IsValid], "true", StringComparison.Ordinal))`
	`427`	`+ if (!string.Equals(isValid, "true", StringComparison.Ordinal))`
`430`	`428`	`{`
`431`	`429`	`Log.InvalidSecurityAssertion(Logger);`
`432`	`430`	`return false;`