Browse Source

Bump the .NET SDK and dependencies

pull/1765/head
Kévin Chalet 3 years ago
parent
commit
c19deeb698
  1. 134
      Directory.Packages.props
  2. 1
      gen/OpenIddict.Client.WebIntegration.Generators/OpenIddict.Client.WebIntegration.Generators.csproj
  3. 4
      global.json
  4. 1
      sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj
  5. 1
      sandbox/OpenIddict.Sandbox.Wpf.Client/OpenIddict.Sandbox.Wpf.Client.csproj

134
Directory.Packages.props

@ -20,6 +20,7 @@
<ItemGroup Label="Package versions for .NET Framework 4.6.1" <ItemGroup Label="Package versions for .NET Framework 4.6.1"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '4.6.1')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '4.6.1')) ">
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.2.1" />
<PackageVersion Include="EntityFramework" Version="6.4.4" /> <PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" /> <PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
@ -35,15 +36,14 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" /> <PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" /> <PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" /> <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" /> <PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" /> <PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" /> <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" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" /> <PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" /> <PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
@ -58,14 +58,14 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" /> <PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" /> <PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!-- <!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -78,6 +78,7 @@
<ItemGroup Label="Package versions for .NET Framework 4.7.2" <ItemGroup Label="Package versions for .NET Framework 4.7.2"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '4.7.2')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '4.7.2')) ">
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.2.1" />
<PackageVersion Include="EntityFramework" Version="6.4.4" /> <PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" /> <PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
@ -92,14 +93,13 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" /> <PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" /> <PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" /> <PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" /> <PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" /> <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" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" /> <PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" /> <PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
@ -114,14 +114,14 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" /> <PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" /> <PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!-- <!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -134,6 +134,7 @@
<ItemGroup Label="Package versions for .NET Framework 4.8" <ItemGroup Label="Package versions for .NET Framework 4.8"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '4.8')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '4.8')) ">
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.2.1" />
<PackageVersion Include="EntityFramework" Version="6.4.4" /> <PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" /> <PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
@ -148,14 +149,13 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" /> <PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" /> <PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" /> <PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" /> <PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" /> <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" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" /> <PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" /> <PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
@ -170,7 +170,7 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" /> <PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" /> <PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!-- <!--
@ -181,9 +181,9 @@
<PackageVersion Include="Autofac.Mvc5" Version="6.0.0" /> <PackageVersion Include="Autofac.Mvc5" Version="6.0.0" />
<PackageVersion Include="Autofac.Owin" Version="6.0.1" /> <PackageVersion Include="Autofac.Owin" Version="6.0.1" />
<PackageVersion Include="Autofac.WebApi2.Owin" Version="6.0.0" /> <PackageVersion Include="Autofac.WebApi2.Owin" Version="6.0.0" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.4" /> <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.4" /> <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.4" /> <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
<PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" /> <PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
<PackageVersion Include="Microsoft.AspNet.Identity.Owin" Version="2.2.3" /> <PackageVersion Include="Microsoft.AspNet.Identity.Owin" Version="2.2.3" />
<PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.9" /> <PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.9" />
@ -198,7 +198,7 @@
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" /> <PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Security.OAuth" 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="Microsoft.Web.Infrastructure" Version="2.0.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" /> <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Spectre.Console" Version="0.46.0" /> <PackageVersion Include="Spectre.Console" Version="0.46.0" />
<PackageVersion Include="WebGrease" Version="1.6.0" /> <PackageVersion Include="WebGrease" Version="1.6.0" />
@ -206,7 +206,7 @@
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -231,11 +231,11 @@
<PackageVersion Include="Microsoft.Extensions.Options" 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.Primitives" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" 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.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" /> <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.7" /> <PackageVersion Include="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.7" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" /> <PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
@ -247,14 +247,14 @@
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" /> <PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!-- <!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -268,19 +268,19 @@
<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')) ">
<PackageVersion Include="EntityFramework" Version="6.4.4" /> <PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.12" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.16" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" /> <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" /> <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" /> <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="6.0.12" /> <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="6.0.16" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" /> <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" 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.Primitives" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="6.0.12" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="6.0.16" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.18.0" /> <PackageVersion Include="MongoDB.Driver" Version="2.18.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
@ -289,16 +289,16 @@
--> -->
<PackageVersion Include="AngleSharp" Version="0.17.1" /> <PackageVersion Include="AngleSharp" Version="0.17.1" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.12" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.16" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" /> <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<!-- <!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -312,19 +312,19 @@
<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')) ">
<PackageVersion Include="EntityFramework" Version="6.4.4" /> <PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.1" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" 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.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.1" /> <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Primitives" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="7.0.1" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="7.0.5" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" /> <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.18.0" /> <PackageVersion Include="MongoDB.Driver" Version="2.18.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
@ -333,21 +333,21 @@
--> -->
<PackageVersion Include="AngleSharp" Version="0.17.1" /> <PackageVersion Include="AngleSharp" Version="0.17.1" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="7.0.1" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="7.0.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" /> <PackageVersion Include="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:
--> -->
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.4" /> <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.4" /> <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.4" /> <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.1" /> <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.5.0" /> <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.5.0" />
<PackageVersion Include="Spectre.Console" Version="0.46.0" /> <PackageVersion Include="Spectre.Console" Version="0.46.0" />
@ -356,7 +356,7 @@
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -369,6 +369,7 @@
<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')) ">
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.2.1" />
<PackageVersion Include="EntityFramework" Version="6.4.4" /> <PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" /> <PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
@ -384,15 +385,14 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" /> <PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" /> <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" /> <PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" /> <PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<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="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.7" /> <PackageVersion Include="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.7" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" /> <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" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" /> <PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="4.7.0" /> <PackageVersion Include="System.ComponentModel.Annotations" Version="4.7.0" />
@ -407,22 +407,22 @@
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" /> <PackageVersion Include="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:
--> -->
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" /> <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" /> <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
<PackageVersion Include="Scriban" Version="5.5.1" /> <PackageVersion Include="Scriban" Version="5.7.0" />
<PackageVersion Include="System.Interactive" Version="4.1.1" /> <PackageVersion Include="System.Interactive" Version="4.1.1" />
<!-- <!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -446,10 +446,10 @@
<PackageVersion Include="Microsoft.Extensions.Options" 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.Primitives" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.32" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.32" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.30.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" /> <PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<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="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" /> <PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="4.7.0" /> <PackageVersion Include="System.ComponentModel.Annotations" Version="4.7.0" />
@ -464,14 +464,14 @@
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" /> <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageVersion Include="Moq" Version="4.18.3" /> <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" /> <PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!-- <!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard). some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
--> -->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.7.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
gen/OpenIddict.Client.WebIntegration.Generators/OpenIddict.Client.WebIntegration.Generators.csproj

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign> <PublicSign>false</PublicSign>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>

4
global.json

@ -1,12 +1,12 @@
{ {
"sdk": { "sdk": {
"version": "7.0.101", "version": "7.0.203",
"allowPrerelease": true, "allowPrerelease": true,
"rollForward": "major" "rollForward": "major"
}, },
"tools": { "tools": {
"dotnet": "7.0.101" "dotnet": "7.0.203"
}, },
"msbuild-sdks": { "msbuild-sdks": {

1
sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj

@ -21,7 +21,6 @@
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" /> <PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" />
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" /> <PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.Extensions.Hosting" VersionOverride="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
sandbox/OpenIddict.Sandbox.Wpf.Client/OpenIddict.Sandbox.Wpf.Client.csproj

@ -22,7 +22,6 @@
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" /> <PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" />
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" /> <PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.Extensions.Hosting" VersionOverride="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Loading…
Cancel
Save