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

Revamp Packages.props and bump .NET and third-party dependencies

pull/1540/head
Kévin Chalet 3 years ago
parent
180a0e9c96
commit
e3b4337b85
14 changed files with 220 additions and 126 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. 226
      Packages.props
  2. 6
      global.json
  3. 4
      sandbox/OpenIddict.Sandbox.AspNet.Client/Views/Web.config
  4. 2
      sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config
  5. 4
      sandbox/OpenIddict.Sandbox.AspNet.Server/Views/Web.config
  6. 10
      sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config
  7. 17
      src/OpenIddict.Abstractions/OpenIddict.Abstractions.csproj
  8. 22
      src/OpenIddict.Client.SystemNetHttp/OpenIddict.Client.SystemNetHttp.csproj
  9. 4
      src/OpenIddict.Client/OpenIddict.Client.csproj
  10. 24
      src/OpenIddict.Validation.SystemNetHttp/OpenIddict.Validation.SystemNetHttp.csproj
  11. 3
      src/OpenIddict.Validation/OpenIddict.Validation.csproj
  12. 8
      test/OpenIddict.Client.IntegrationTests/OpenIddict.Client.IntegrationTests.csproj
  13. 8
      test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
  14. 8
      test/OpenIddict.Validation.IntegrationTests/OpenIddict.Validation.IntegrationTests.csproj

226
Packages.props
View File

@ -1,59 +1,88 @@
<Project>
<ItemGroup>
<PackageReference Update="AngleSharp" Version="0.16.1" />
<!--
Note: to cover as many platforms as possible and reduce the number of package references,
OpenIddict extensively uses multi-targeting and per-framework package references. As such,
package versions must be carefully chosen to ensure they are consistent and compatible with the
TFMs supported by OpenIddict (e.g for .NET Core 2.1, only Microsoft.AspNetCore.* packages within
the [2.1.0,2.2.0) range are allowed). Special care must also be taken when selecting versions
to ensure that transitive references also respect the same constraints (e.g for .NET Core 2.1,
a package must only depend on Microsoft.Extensions.* packages within the [2.1.0,2.2.0) range).
-->
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" 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.EntityFrameworkCore.Relational" Version="2.1.14" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" 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.Logging" 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.WebEncoders" Version="2.1.1" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
<PackageReference Update="Microsoft.Owin.Security" Version="4.2.2" />
<PackageReference Update="MongoDB.Bson" Version="2.11.6" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Update="System.Linq.Async" Version="4.1.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.Json" Version="4.7.2" />
<!--
Note: the following references are exclusively used in the test projects:
-->
<PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Update="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageReference Update="Moq" Version="4.18.2" />
<!--
Note: the following references are exclusively used in the samples:
-->
<PackageReference Update="Antlr" Version="3.5.0.2" />
<PackageReference Update="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
<PackageReference Update="Autofac.Mvc5" Version="6.0.0" />
<PackageReference Update="Autofac.Owin" Version="6.0.1" />
<PackageReference Update="Autofac.WebApi2.Owin" Version="6.0.0" />
<PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
<PackageReference Update="Microsoft.AspNet.Identity.Owin" Version="2.2.3" />
<PackageReference Update="Microsoft.AspNet.Mvc" Version="5.2.8" />
<PackageReference Update="Microsoft.AspNet.Mvc" Version="5.2.9" />
<PackageReference Update="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
<PackageReference Update="Microsoft.AspNet.WebApi.Owin" Version="5.2.8" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
<PackageReference Update="Microsoft.AspNet.WebApi.Owin" Version="5.2.9" />
<PackageReference Update="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
<PackageReference Update="Microsoft.Owin.Diagnostics" Version="4.2.2" />
<PackageReference Update="Microsoft.Owin.Host.HttpListener" Version="4.2.2" />
<PackageReference Update="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
<PackageReference Update="Microsoft.Owin.Hosting" Version="4.2.2" />
<PackageReference Update="Microsoft.Owin.Security" 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.Testing" Version="4.2.2" />
<PackageReference Update="Microsoft.Web.Infrastructure" Version="1.0.0" />
<PackageReference Update="Moq" Version="4.18.1" />
<PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Update="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.4.0" />
<PackageReference Update="Quartz.Extensions.Hosting" Version="3.4.0" />
<PackageReference Update="WebGrease" Version="1.6.0" />
<PackageReference Update="Scriban" Version="5.4.6" />
<PackageReference Update="SmartFormat" Version="3.0.0" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1'))) Or
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1'))) Or
('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.0'))) ">
<PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.6" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.1.14" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.14" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
@ -63,100 +92,111 @@
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
<PackageReference Update="MongoDB.Bson" Version="2.11.6" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Update="System.Interactive" Version="4.1.1" />
<PackageReference Update="System.Linq.Async" Version="4.1.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.Json" Version="4.7.2" />
<!--
Note: the following references are exclusively used in the test projects:
-->
<PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Update="Moq" Version="4.18.2" />
<!--
Note: the following references are exclusively used in the source generators:
-->
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
<PackageReference Update="Scriban" Version="5.5.0" />
<PackageReference Update="System.Interactive" Version="4.1.1" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '3.1'))) Or
('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1'))) ">
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.26" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.26" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.26" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.26" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.26" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.Options" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.26" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.26" />
<PackageReference Update="MongoDB.Bson" Version="2.11.6" />
<PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" 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.Memory" Version="3.1.30" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" 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.Logging" 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.WebEncoders" Version="3.1.30" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
<PackageReference Update="MongoDB.Driver" Version="2.11.6" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Update="System.Interactive" Version="4.1.1" />
<PackageReference Update="System.Linq.Async" Version="4.1.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.Json" Version="4.7.2" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '5.0'))) ">
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.17" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="5.0.17" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.17" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="5.0.17" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="5.0.17" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.17" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="5.0.1" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="5.0.17" />
<PackageReference Update="MongoDB.Bson" Version="2.16.1" />
<PackageReference Update="MongoDB.Driver" Version="2.16.1" />
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Update="System.Interactive" Version="4.1.1" />
<PackageReference Update="System.Linq.Async" Version="5.0.0" />
<PackageReference Update="System.Net.Http.Json" Version="5.0.0" />
<PackageReference Update="System.Text.Encodings.Web" Version="5.0.1" />
<PackageReference Update="System.Text.Json" Version="5.0.2" />
<!--
Note: the following references are exclusively used in the test projects:
-->
<PackageReference Update="AngleSharp" Version="0.14.0" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.30" />
<PackageReference Update="Moq" Version="4.18.2" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0'))) ">
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.6" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="6.0.6" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.6" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.6" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
<PackageReference Update="EntityFramework" Version="6.4.4" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.6" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.10" />
<PackageReference Update="Microsoft.Extensions.Logging" 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.WebEncoders" Version="6.0.6" />
<PackageReference Update="MongoDB.Bson" Version="2.16.1" />
<PackageReference Update="MongoDB.Driver" Version="2.16.1" />
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0" />
<PackageReference Update="System.Interactive" Version="4.1.1" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="6.0.10" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.16.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
<PackageReference Update="MongoDB.Driver" Version="2.18.0" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Update="SmartFormat" Version="3.2.0" />
<PackageReference Update="System.Linq.Async" Version="6.0.1" />
<PackageReference Update="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Update="System.Text.Encodings.Web" Version="6.0.0" />
<PackageReference Update="System.Text.Json" Version="6.0.5" />
<!--
Note: the following references are exclusively used in the test projects:
-->
<PackageReference Update="AngleSharp" Version="0.17.1" />
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.10" />
<PackageReference Update="Moq" Version="4.18.2" />
<!--
Note: the following references are exclusively used in the samples:
-->
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
<PackageReference Update="Quartz.Extensions.Hosting" Version="3.5.0" />
</ItemGroup>
</Project>

6
global.json
View File

@ -1,15 +1,15 @@
{
"sdk": {
"version": "6.0.301"
"version": "6.0.402"
},
"tools": {
"dotnet": "6.0.301",
"dotnet": "6.0.402",
"runtimes": {
"aspnetcore": [
"2.1.30",
"3.1.26"
"3.1.30"
]
}
},

4
sandbox/OpenIddict.Sandbox.AspNet.Client/Views/Web.config
View File

@ -9,7 +9,7 @@
</configSections>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
@ -36,7 +36,7 @@
<system.web>
<compilation>
<assemblies>
<add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</assemblies>
</compilation>
</system.web>

2
sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config
View File

@ -31,7 +31,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

4
sandbox/OpenIddict.Sandbox.AspNet.Server/Views/Web.config
View File

@ -9,7 +9,7 @@
</configSections>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
@ -36,7 +36,7 @@
<system.web>
<compilation>
<assemblies>
<add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</assemblies>
</compilation>
</system.web>

10
sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config
View File

@ -37,7 +37,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@ -139,19 +139,19 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
<assemblyIdentity name="System.Web.Http.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

17
src/OpenIddict.Abstractions/OpenIddict.Abstractions.csproj
View File

@ -13,9 +13,6 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Primitives" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>
<ItemGroup
@ -24,6 +21,13 @@
<PackageReference Include="Microsoft.Bcl.HashCode" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Text.Encodings.Web" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>
@ -32,6 +36,13 @@
<PackageReference Include="System.ComponentModel.Annotations" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Text.Json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="**\*.resx" GenerateSource="true" GenerateResourcesCodeAsConstants="true" />
</ItemGroup>

22
src/OpenIddict.Client.SystemNetHttp/OpenIddict.Client.SystemNetHttp.csproj
View File

@ -14,15 +14,27 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
<!--
Note: while brought transitively by the Microsoft.Extensions.Http.Polly package,
the Polly.Extensions.Http dependency is explicitly added to work around a breaking
change introduced between Polly 6.x and 7.x and force both this package and applications
that reference OpenIddict.Validation.SystemNetHttp to use the latest Polly version (7.x).
Note: while brought transitively by the Microsoft.Extensions.Http.Polly package, the Polly.Extensions.Http
dependency is explicitly added on .NET Standard <2.1, .NET Framework and .NET Core <3.0 to work around a
breaking change introduced between Polly 6.x and 7.x and force both this package and applications that
reference OpenIddict.Client.SystemNetHttp to use the latest Polly version (7.x) on these platforms.
-->
<PackageReference Include="Microsoft.Extensions.Http.Polly" />
<PackageReference Include="Polly.Extensions.Http" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>

4
src/OpenIddict.Client/OpenIddict.Client.csproj
View File

@ -18,9 +18,9 @@ To use the client feature on ASP.NET Core or OWIN/Katana, reference the OpenIddi
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
<PackageReference Include="Microsoft.IdentityModel.Protocols" />
</ItemGroup>
<ItemGroup

24
src/OpenIddict.Validation.SystemNetHttp/OpenIddict.Validation.SystemNetHttp.csproj
View File

@ -14,15 +14,27 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
<!--
Note: while brought transitively by the Microsoft.Extensions.Http.Polly package,
the Polly.Extensions.Http dependency is explicitly added to work around a breaking
change introduced between Polly 6.x and 7.x and force both this package and applications
that reference OpenIddict.Validation.SystemNetHttp to use the latest Polly version (7.x).
Note: while brought transitively by the Microsoft.Extensions.Http.Polly package, the Polly.Extensions.Http
dependency is explicitly added on .NET Standard <2.1, .NET Framework and .NET Core <3.0 to work around a
breaking change introduced between Polly 6.x and 7.x and force both this package and applications that
reference OpenIddict.Validation.SystemNetHttp to use the latest Polly version (7.x) on these platforms.
-->
<PackageReference Include="Microsoft.Extensions.Http.Polly" />
<PackageReference Include="Polly.Extensions.Http" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>

3
src/OpenIddict.Validation/OpenIddict.Validation.csproj
View File

@ -18,7 +18,8 @@ To use the validation feature on ASP.NET Core or OWIN/Katana, reference the Open
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
<PackageReference Include="Microsoft.IdentityModel.Protocols" />
</ItemGroup>
<ItemGroup>

8
test/OpenIddict.Client.IntegrationTests/OpenIddict.Client.IntegrationTests.csproj
View File

@ -15,13 +15,19 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>
<ItemGroup>
<Using Include="OpenIddict.Abstractions" />
<Using Include="OpenIddict.Abstractions.OpenIddictConstants" Static="true" />

8
test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
View File

@ -20,13 +20,19 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>
<ItemGroup>
<Using Include="OpenIddict.Abstractions" />
<Using Include="OpenIddict.Abstractions.OpenIddictConstants" Static="true" />

8
test/OpenIddict.Validation.IntegrationTests/OpenIddict.Validation.IntegrationTests.csproj
View File

@ -19,13 +19,19 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Net.Http.Json" />
</ItemGroup>
<ItemGroup>
<Using Include="OpenIddict.Abstractions" />
<Using Include="OpenIddict.Abstractions.OpenIddictConstants" Static="true" />

Write Preview
Loading…
Cancel
Save