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

Update the .NET SDK and bump all dependencies

pull/1453/head
Kévin Chalet 4 years ago
parent
af9f6a66a2
commit
6f9c559682
5 changed files with 95 additions and 84 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. 118
      Packages.props
  2. 10
      global.json
  3. 8
      sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config
  4. 34
      sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config
  5. 9
      test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs

118
Packages.props
View File

@ -1,41 +1,41 @@
<Project>
<ItemGroup>
<PackageReference Update="AngleSharp" Version="1.0.0-alpha-844" />
<PackageReference Update="AngleSharp" Version="0.16.1" />
<PackageReference Update="Antlr" Version="3.5.0.2" />
<PackageReference Update="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
<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.1.0" />
<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.7" />
<PackageReference Update="Microsoft.AspNet.Mvc" Version="5.2.8" />
<PackageReference Update="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
<PackageReference Update="Microsoft.AspNet.WebApi.Owin" Version="5.2.7" />
<PackageReference Update="Microsoft.AspNet.WebApi.Owin" Version="5.2.8" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<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.0" />
<PackageReference Update="Microsoft.Owin.Diagnostics" Version="4.2.0" />
<PackageReference Update="Microsoft.Owin.Host.HttpListener" Version="4.2.0" />
<PackageReference Update="Microsoft.Owin.Host.SystemWeb" Version="4.2.0" />
<PackageReference Update="Microsoft.Owin.Hosting" Version="4.2.0" />
<PackageReference Update="Microsoft.Owin.Security" Version="4.2.0" />
<PackageReference Update="Microsoft.Owin.Security.Cookies" Version="4.2.0" />
<PackageReference Update="Microsoft.Owin.Security.OAuth" Version="4.2.0" />
<PackageReference Update="Microsoft.Owin.Testing" Version="4.2.0" />
<PackageReference Update="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.18.0" />
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.18.0" />
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.18.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="MongoDB.Bson" Version="2.10.4" />
<PackageReference Update="MongoDB.Driver" Version="2.10.4" />
<PackageReference Update="Moq" Version="4.16.1" />
<PackageReference Update="Newtonsoft.Json" Version="10.0.1" />
<PackageReference Update="Portable.BouncyCastle" Version="1.8.10" />
<PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.2.4" />
<PackageReference Update="Quartz.Extensions.Hosting" Version="3.2.4" />
<PackageReference Update="Moq" Version="4.18.1" />
<PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
<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" />
</ItemGroup>
@ -71,21 +71,21 @@
<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.16" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.16" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.16" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.16" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.16" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.Options" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.16" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.16" />
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.25" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.25" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.25" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.25" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.25" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.Options" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.25" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.25" />
<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" />
@ -96,52 +96,52 @@
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '5.0'))) ">
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.7" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="5.0.7" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
<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.1" />
<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.0" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="5.0.7" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="5.0.1" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="5.0.17" />
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
<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.1" />
<PackageReference Update="System.Text.Json" Version="5.0.2" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0'))) ">
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="6.0.5" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.5" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.5" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" 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.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.5" />
<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.0" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="6.0.5" />
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0" />
<PackageReference Update="System.Linq.Async" Version="5.0.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.0" />
<PackageReference Update="System.Text.Json" Version="6.0.4" />
</ItemGroup>
</Project>

10
global.json
View File

@ -1,16 +1,16 @@
{
"sdk": {
"version": "6.0.202"
"version": "6.0.300"
},
"tools": {
"dotnet": "6.0.202",
"dotnet": "6.0.300",
"runtimes": {
"aspnetcore": [
"2.1.28",
"3.1.16",
"5.0.7"
"2.1.30",
"3.1.25",
"5.0.17"
]
}
},

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

@ -30,8 +30,8 @@
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
<assemblyIdentity name="System.Web.Mvc" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@ -54,8 +54,8 @@
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="Microsoft.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

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

@ -36,8 +36,8 @@
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
<assemblyIdentity name="System.Web.Mvc" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@ -60,26 +60,26 @@
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="Microsoft.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="Microsoft.Owin.Security" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@ -138,14 +138,20 @@
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
<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" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
<assemblyIdentity name="System.Web.Http" culture="neutral" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.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" />
</dependentAssembly>
</assemblyBinding>
</runtime>

9
test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs
View File

@ -426,12 +426,17 @@ public class OpenIddictServerIntegrationTestClient : IAsyncDisposable
// that always return their HTTP responses encoded using UTF-8. As such, the stream
// returned by ReadAsStreamAsync() is always assumed to contain UTF-8 encoded payloads.
using var stream = await message.Content!.ReadAsStreamAsync();
using var document = await HtmlParser.ParseDocumentAsync(stream);
if (document.Body is null)
{
return new OpenIddictResponse();
}
// Note: a dictionary is deliberately not used here to allow multiple parameters with the
// same name to be retrieved. While initially not allowed by the core OAuth2 specification,
// this is required for derived drafts like the OAuth2 token exchange specification.
var parameters = new List<KeyValuePair<string, string>>();
var parameters = new List<KeyValuePair<string, string?>>();
foreach (var element in document.Body.GetElementsByTagName("input"))
{
@ -443,7 +448,7 @@ public class OpenIddictServerIntegrationTestClient : IAsyncDisposable
var value = element.GetAttribute("value");
parameters.Add(new KeyValuePair<string, string>(name, value));
parameters.Add(new KeyValuePair<string, string?>(name, value));
}
return new OpenIddictResponse(

Write Preview
Loading…
Cancel
Save