From 6f9c559682768271009a101f9096669f7fa584ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Mon, 30 May 2022 14:34:16 +0200 Subject: [PATCH] Update the .NET SDK and bump all dependencies --- Packages.props | 118 +++++++++--------- global.json | 10 +- .../Web.config | 8 +- .../Web.config | 34 ++--- .../OpenIddictServerIntegrationTestClient.cs | 9 +- 5 files changed, 95 insertions(+), 84 deletions(-) diff --git a/Packages.props b/Packages.props index 0bda66c0..14fd2242 100644 --- a/Packages.props +++ b/Packages.props @@ -1,41 +1,41 @@ - + - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + @@ -71,21 +71,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -96,52 +96,52 @@ - - - - - - + + + + + + - + - - + + - + - - - - - - + + + + + + - + - + - + - + - + diff --git a/global.json b/global.json index 65a12775..acf045c9 100644 --- a/global.json +++ b/global.json @@ -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" ] } }, diff --git a/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config b/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config index 7d1994f5..00f16a2b 100644 --- a/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config +++ b/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config @@ -30,8 +30,8 @@ - - + + @@ -54,8 +54,8 @@ - - + + diff --git a/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config b/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config index d786831b..c05060bc 100644 --- a/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config +++ b/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config @@ -36,8 +36,8 @@ - - + + @@ -60,26 +60,26 @@ - - + + - - + + - - + + - - + + @@ -138,14 +138,20 @@ - - + + - - + + + + + + + + diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs index 229c4f1e..627c3207 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs @@ -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>(); + var parameters = new List>(); 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(name, value)); + parameters.Add(new KeyValuePair(name, value)); } return new OpenIddictResponse(