tsai
/
openiddict-core
mirror of https://github.com/openiddict/openiddict-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Incorporate the changes committed in the rel/4.0.0-rc2 branch

pull/1627/head
Kévin Chalet 3 years ago
parent
b3837484b4 1e38843476
commit
89dcb5d72e
3 changed files with 73 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      .github/workflows/build.yml
  2. 136
      Directory.Packages.props
  3. 4
      global.json

6
.github/workflows/build.yml
View File

@ -32,9 +32,9 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
3.1.425
6.0.403
7.0.100
3.1.426
6.0.404
7.0.101
- name: Setup NuGet
uses: nuget/setup-nuget@v1

136
Directory.Packages.props
View File

@ -34,9 +34,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
@ -57,7 +57,7 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!--
@ -91,9 +91,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
@ -114,7 +114,7 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!--
@ -148,9 +148,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
@ -171,7 +171,7 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!--
@ -193,7 +193,7 @@
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Security.OAuth" Version="4.2.2" />
<PackageVersion Include="Microsoft.Web.Infrastructure" Version="2.0.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
<PackageVersion Include="WebGrease" Version="1.6.0" />
<!--
@ -214,20 +214,20 @@
<ItemGroup Label="Package versions for .NET Core 3.1"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '3.1')) ">
<PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.31" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.31" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.32" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.32" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="SmartFormat" Version="3.2.0" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
@ -237,9 +237,9 @@
-->
<PackageVersion Include="AngleSharp" Version="0.14.0" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.31" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!--
@ -260,18 +260,18 @@
<ItemGroup Label="Package versions for .NET 6.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
<PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.12" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="6.0.11" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="6.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="6.0.11" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="6.0.12" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="MongoDB.Driver" Version="2.18.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="SmartFormat" Version="3.2.0" />
@ -281,9 +281,9 @@
-->
<PackageVersion Include="AngleSharp" Version="0.17.1" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.12" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<!--
@ -304,18 +304,18 @@
<ItemGroup Label="Package versions for .NET 7.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) ">
<PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="7.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="7.0.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="MongoDB.Driver" Version="2.18.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="SmartFormat" Version="3.2.0" />
@ -325,16 +325,16 @@
-->
<PackageVersion Include="AngleSharp" Version="0.17.1" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<!--
Note: the following references are exclusively used in the samples:
-->
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.5.0" />
<!--
@ -370,9 +370,9 @@
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.0.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
@ -390,7 +390,7 @@
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!--
@ -398,7 +398,7 @@
-->
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
<PackageVersion Include="Scriban" Version="5.5.0" />
<PackageVersion Include="Scriban" Version="5.5.1" />
<PackageVersion Include="System.Interactive" Version="4.1.1" />
<!--
@ -419,20 +419,20 @@
<ItemGroup Label="Package versions for .NET Standard 2.1"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1')) ">
<PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.31" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.31" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.32" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.32" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="SmartFormat" Version="3.2.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
@ -446,9 +446,9 @@
-->
<PackageVersion Include="AngleSharp" Version="0.14.0" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.31" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.31" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageVersion Include="Moq" Version="4.18.3" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!--

4
global.json
View File

@ -1,10 +1,10 @@
{
"sdk": {
"version": "7.0.100"
"version": "7.0.101"
},
"tools": {
"dotnet": "7.0.100"
"dotnet": "7.0.101"
},
"msbuild-sdks": {

Write Preview
Loading…
Cancel
Save