Browse Source

Bump the .NET 7.0 SDK and dependencies to 7.0 RTM

pull/1562/head
Kévin Chalet 3 years ago
parent
commit
1846acc3da
  1. 450
      Packages.props
  2. 4
      global.json
  3. 19
      src/OpenIddict.Client/OpenIddictClientHandlers.cs

450
Packages.props

@ -20,66 +20,66 @@
<ItemGroup Label="Package versions for .NET Framework 4.6.1 and higher" <ItemGroup Label="Package versions for .NET Framework 4.6.1 and higher"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.6.1')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.6.1')) ">
<PackageReference Update="EntityFramework" Version="6.4.4" /> <PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" /> <PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" /> <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.1.14" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.1.14" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" /> <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="2.1.6" /> <PackageReference Update="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" />
<PackageReference Update="Microsoft.Owin.Security" Version="4.2.2" /> <PackageReference Update="Microsoft.Owin.Security" Version="4.2.2" />
<PackageReference Update="MongoDB.Bson" Version="2.11.6" /> <PackageReference Update="MongoDB.Bson" Version="2.11.6" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" /> <PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Polly.Extensions.Http" Version="3.0.0" /> <PackageReference Update="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" /> <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" /> <PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" /> <PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="System.Net.Http.Json" Version="3.2.1" /> <PackageReference Update="System.Net.Http.Json" Version="3.2.1" />
<PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" /> <PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" />
<PackageReference Update="System.Text.Json" Version="4.7.2" /> <PackageReference Update="System.Text.Json" Version="4.7.2" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<PackageReference Update="AngleSharp" Version="0.14.0" /> <PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Update="Microsoft.Owin.Testing" Version="4.2.2" /> <PackageReference Update="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageReference Update="Moq" Version="4.18.2" /> <PackageReference Update="Moq" Version="4.18.2" />
<PackageReference Update="System.Linq.Async" Version="4.1.1" /> <PackageReference Update="System.Linq.Async" Version="4.1.1" />
<!-- <!--
Note: the following references are exclusively used in the samples: Note: the following references are exclusively used in the samples:
--> -->
<PackageReference Update="Antlr" Version="3.5.0.2" /> <PackageReference Update="Antlr" Version="3.5.0.2" />
<PackageReference Update="Autofac.Extensions.DependencyInjection" Version="7.2.0" /> <PackageReference Update="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
<PackageReference Update="Autofac.Mvc5" Version="6.0.0" /> <PackageReference Update="Autofac.Mvc5" Version="6.0.0" />
<PackageReference Update="Autofac.Owin" Version="6.0.1" /> <PackageReference Update="Autofac.Owin" Version="6.0.1" />
<PackageReference Update="Autofac.WebApi2.Owin" Version="6.0.0" /> <PackageReference Update="Autofac.WebApi2.Owin" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" /> <PackageReference Update="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
<PackageReference Update="Microsoft.AspNet.Identity.Owin" Version="2.2.3" /> <PackageReference Update="Microsoft.AspNet.Identity.Owin" Version="2.2.3" />
<PackageReference Update="Microsoft.AspNet.Mvc" Version="5.2.9" /> <PackageReference Update="Microsoft.AspNet.Mvc" Version="5.2.9" />
<PackageReference Update="Microsoft.AspNet.Web.Optimization" Version="1.1.3" /> <PackageReference Update="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
<PackageReference Update="Microsoft.AspNet.WebApi.Owin" Version="5.2.9" /> <PackageReference Update="Microsoft.AspNet.WebApi.Owin" Version="5.2.9" />
<PackageReference Update="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" /> <PackageReference Update="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
<PackageReference Update="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" /> <PackageReference Update="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
<PackageReference Update="Microsoft.Owin.Security.Cookies" Version="4.2.2" /> <PackageReference Update="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
<PackageReference Update="Microsoft.Owin.Security.OAuth" Version="4.2.2" /> <PackageReference Update="Microsoft.Owin.Security.OAuth" Version="4.2.2" />
<PackageReference Update="Microsoft.Web.Infrastructure" Version="1.0.0" /> <PackageReference Update="Microsoft.Web.Infrastructure" Version="1.0.0" />
<PackageReference Update="Newtonsoft.Json" Version="10.0.3" /> <PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Update="WebGrease" Version="1.6.0" /> <PackageReference Update="WebGrease" Version="1.6.0" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -92,47 +92,47 @@
<ItemGroup Label="Package versions for .NET Core 2.1" <ItemGroup Label="Package versions for .NET Core 2.1"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1')) ">
<PackageReference Update="EntityFramework" Version="6.4.4" /> <PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" /> <PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.1.14" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.1.14" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" /> <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="2.1.6" /> <PackageReference Update="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" /> <PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Polly.Extensions.Http" Version="3.0.0" /> <PackageReference Update="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" /> <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" /> <PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Net.Http.Json" Version="3.2.1" /> <PackageReference Update="System.Net.Http.Json" Version="3.2.1" />
<PackageReference Update="System.Text.Json" Version="4.7.2" /> <PackageReference Update="System.Text.Json" Version="4.7.2" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<PackageReference Update="AngleSharp" Version="0.14.0" /> <PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Update="Moq" Version="4.18.2" /> <PackageReference Update="Moq" Version="4.18.2" />
<PackageReference Update="System.Linq.Async" Version="4.1.1" /> <PackageReference Update="System.Linq.Async" Version="4.1.1" />
<!-- <!--
Note: the following references are exclusively used in the source generators: Note: the following references are exclusively used in the source generators:
--> -->
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" /> <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" /> <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
<PackageReference Update="Scriban" Version="5.5.0" /> <PackageReference Update="Scriban" Version="5.5.0" />
<PackageReference Update="System.Interactive" Version="4.1.1" /> <PackageReference Update="System.Interactive" Version="4.1.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -145,34 +145,34 @@
<ItemGroup Label="Package versions for .NET Core 3.1" <ItemGroup Label="Package versions for .NET Core 3.1"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '3.1')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '3.1')) ">
<PackageReference Update="EntityFramework" Version="6.4.4" /> <PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.30" /> <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.30" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.30" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Options" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Options" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.30" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" /> <PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" /> <PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Net.Http.Json" Version="3.2.1" /> <PackageReference Update="System.Net.Http.Json" Version="3.2.1" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<PackageReference Update="AngleSharp" Version="0.14.0" /> <PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.30" /> <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.30" />
<PackageReference Update="Moq" Version="4.18.2" /> <PackageReference Update="Moq" Version="4.18.2" />
<PackageReference Update="System.Linq.Async" Version="4.1.1" /> <PackageReference Update="System.Linq.Async" Version="4.1.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -185,39 +185,39 @@
<ItemGroup Label="Package versions for .NET 6.0" <ItemGroup Label="Package versions for .NET 6.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
<PackageReference Update="EntityFramework" Version="6.4.4" /> <PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" /> <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.1" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.10" /> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.10" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" /> <PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="6.0.0" /> <PackageReference Update="Microsoft.Extensions.Primitives" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="6.0.10" /> <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="6.0.10" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" />
<PackageReference Update="MongoDB.Driver" Version="2.18.0" /> <PackageReference Update="MongoDB.Driver" Version="2.18.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" /> <PackageReference Update="SmartFormat" Version="3.2.0" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<PackageReference Update="AngleSharp" Version="0.17.1" /> <PackageReference Update="AngleSharp" Version="0.17.1" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.10" /> <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.10" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Update="Moq" Version="4.18.2" /> <PackageReference Update="Moq" Version="4.18.2" />
<PackageReference Update="System.Linq.Async" Version="6.0.1" /> <PackageReference Update="System.Linq.Async" Version="6.0.1" />
<!-- <!--
Note: the following references are exclusively used in the samples: Note: the following references are exclusively used in the samples:
--> -->
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" /> <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" /> <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
<PackageReference Update="Quartz.Extensions.Hosting" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.Hosting" Version="3.5.0" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -230,39 +230,39 @@
<ItemGroup Label="Package versions for .NET 7.0" <ItemGroup Label="Package versions for .NET 7.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) ">
<PackageReference Update="EntityFramework" Version="6.4.4" /> <PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0-rc.2.22472.11" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0-rc.2.22472.3" /> <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="7.0.0-rc.2.22472.3" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-rc.2.22472.3" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="7.0.0-rc.2.22476.2" /> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0-rc.2.22472.3" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="7.0.0-rc.2.22472.3" /> <PackageReference Update="Microsoft.Extensions.Options" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="7.0.0-rc.2.22472.3" /> <PackageReference Update="Microsoft.Extensions.Primitives" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="7.0.0-rc.2.22476.2" /> <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="7.0.0" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" />
<PackageReference Update="MongoDB.Driver" Version="2.18.0" /> <PackageReference Update="MongoDB.Driver" Version="2.18.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" /> <PackageReference Update="SmartFormat" Version="3.2.0" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<PackageReference Update="AngleSharp" Version="0.17.1" /> <PackageReference Update="AngleSharp" Version="0.17.1" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="7.0.0-rc.2.22476.2" /> <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="7.0.0-rc.2.22472.3" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Update="Moq" Version="4.18.2" /> <PackageReference Update="Moq" Version="4.18.2" />
<PackageReference Update="System.Linq.Async" Version="6.0.1" /> <PackageReference Update="System.Linq.Async" Version="6.0.1" />
<!-- <!--
Note: the following references are exclusively used in the samples: Note: the following references are exclusively used in the samples:
--> -->
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0-rc.2.22476.2" /> <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rc.2.22472.11" /> <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
<PackageReference Update="Quartz.Extensions.Hosting" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.Hosting" Version="3.5.0" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -275,52 +275,52 @@
<ItemGroup Label="Package versions for .NET Standard 2.0" <ItemGroup Label="Package versions for .NET Standard 2.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.0')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.0')) ">
<PackageReference Update="EntityFramework" Version="6.4.4" /> <PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" /> <PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" /> <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.1.14" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.1.14" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" /> <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="2.1.6" /> <PackageReference Update="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" />
<PackageReference Update="MongoDB.Bson" Version="2.11.6" /> <PackageReference Update="MongoDB.Bson" Version="2.11.6" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" /> <PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Polly.Extensions.Http" Version="3.0.0" /> <PackageReference Update="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" /> <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" /> <PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" /> <PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" /> <PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Update="System.Net.Http.Json" Version="3.2.1" /> <PackageReference Update="System.Net.Http.Json" Version="3.2.1" />
<PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" /> <PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" />
<PackageReference Update="System.Text.Json" Version="4.7.2" /> <PackageReference Update="System.Text.Json" Version="4.7.2" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<PackageReference Update="AngleSharp" Version="0.14.0" /> <PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" /> <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Update="Moq" Version="4.18.2" /> <PackageReference Update="Moq" Version="4.18.2" />
<PackageReference Update="System.Linq.Async" Version="4.1.1" /> <PackageReference Update="System.Linq.Async" Version="4.1.1" />
<!-- <!--
Note: the following references are exclusively used in the source generators: Note: the following references are exclusively used in the source generators:
--> -->
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" /> <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" /> <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
<PackageReference Update="Scriban" Version="5.5.0" /> <PackageReference Update="Scriban" Version="5.5.0" />
<PackageReference Update="System.Interactive" Version="4.1.1" /> <PackageReference Update="System.Interactive" Version="4.1.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -333,38 +333,38 @@
<ItemGroup Label="Package versions for .NET Standard 2.1" <ItemGroup Label="Package versions for .NET Standard 2.1"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1')) ">
<PackageReference Update="EntityFramework" Version="6.4.4" /> <PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.30" /> <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.30" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.30" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Options" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Options" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.30" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.24.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" /> <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.24.0" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" /> <PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" /> <PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" /> <PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" /> <PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Update="System.Net.Http.Json" Version="3.2.1" /> <PackageReference Update="System.Net.Http.Json" Version="3.2.1" />
<PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" /> <PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" />
<PackageReference Update="System.Text.Json" Version="4.7.2" /> <PackageReference Update="System.Text.Json" Version="4.7.2" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<PackageReference Update="AngleSharp" Version="0.14.0" /> <PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.30" /> <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.30" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.30" />
<PackageReference Update="Moq" Version="4.18.2" /> <PackageReference Update="Moq" Version="4.18.2" />
<PackageReference Update="System.Linq.Async" Version="4.1.1" /> <PackageReference Update="System.Linq.Async" Version="4.1.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
global.json

@ -1,10 +1,10 @@
{ {
"sdk": { "sdk": {
"version": "7.0.100-rc.2.22477.23" "version": "7.0.100"
}, },
"tools": { "tools": {
"dotnet": "7.0.100-rc.2.22477.23", "dotnet": "7.0.100",
"runtimes": { "runtimes": {
"aspnetcore": [ "aspnetcore": [

19
src/OpenIddict.Client/OpenIddictClientHandlers.cs

@ -4291,21 +4291,20 @@ public static partial class OpenIddictClientHandlers
// Generate a new crypto-secure random identifier that will be used as the code challenge. // Generate a new crypto-secure random identifier that will be used as the code challenge.
context.CodeVerifier = Base64UrlEncoder.Encode(OpenIddictHelpers.CreateRandomArray(size: 256)); context.CodeVerifier = Base64UrlEncoder.Encode(OpenIddictHelpers.CreateRandomArray(size: 256));
if (context.CodeChallengeMethod is CodeChallengeMethods.Plain) context.CodeChallenge = context.CodeChallengeMethod switch
{ {
// Use the code verifier as the code challenge. // For "plain", use the code verifier as the code challenge.
context.CodeChallenge = context.CodeVerifier; CodeChallengeMethods.Plain => context.CodeVerifier,
}
else if (context.CodeChallengeMethod is CodeChallengeMethods.Sha256) // For S256, compute the SHA-256 hash of the code verifier and use it as the code challenge.
{
// Compute the SHA-256 hash of the code verifier and use it as the code challenge.
// //
// Note: ASCII is deliberately used here, as it's the encoding required by the specification. // Note: ASCII is deliberately used here, as it's the encoding required by the specification.
// For more information, see https://datatracker.ietf.org/doc/html/rfc7636#section-4.2. // For more information, see https://datatracker.ietf.org/doc/html/rfc7636#section-4.2.
context.CodeChallenge = Base64UrlEncoder.Encode(OpenIddictHelpers.ComputeSha256Hash( CodeChallengeMethods.Sha256 => Base64UrlEncoder.Encode(
Encoding.ASCII.GetBytes(context.CodeVerifier))); OpenIddictHelpers.ComputeSha256Hash(Encoding.ASCII.GetBytes(context.CodeVerifier))),
}
_ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0045))
};
return default; return default;
} }

Loading…
Cancel
Save