From 13f352af6da67b11cca6dc589e025de195008984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Wed, 29 Oct 2025 22:21:49 +0100 Subject: [PATCH] Bump the .NET SDK to 10.0.100-rc.2.25502.107 and add .NET 10 TFMs --- Directory.Build.props | 20 ++++-- Directory.Build.targets | 6 ++ Directory.Packages.props | 67 ++++++++++++++++--- WorkloadRollback.json | 31 ++++----- global.json | 7 +- ...penIddict.Sandbox.AspNetCore.Client.csproj | 2 +- ...penIddict.Sandbox.AspNetCore.Server.csproj | 2 +- .../OpenIddict.Sandbox.Console.Client.csproj | 2 +- .../OpenIddict.Sandbox.Maui.Client.csproj | 8 +-- .../OpenIddict.Sandbox.WinForms.Client.csproj | 3 +- .../OpenIddict.Sandbox.Wpf.Client.csproj | 3 +- .../OpenIddictHelpers.cs | 27 ++++++-- ...OpenIddict.Client.SystemIntegration.csproj | 10 +++ src/OpenIddict/OpenIddict.csproj | 10 +++ .../OpenIddict.Client.IntegrationTests.csproj | 5 ++ ...nIddictServerAspNetCoreIntegrationTests.cs | 2 + .../OpenIddict.Server.IntegrationTests.csproj | 5 ++ ...nIddict.Validation.IntegrationTests.csproj | 5 ++ 18 files changed, 166 insertions(+), 49 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5f192fdf..bf199d5d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,6 +20,7 @@ true true false + false true @@ -105,27 +106,32 @@ net8.0; - net9.0 + net9.0; + net10.0 - net9.0-android35.0 + net9.0-android; + net10.0-android - net9.0-ios18.0 + net9.0-ios; + net10.0-ios - net9.0-maccatalyst18.0 + net9.0-maccatalyst; + net10.0-maccatalyst - net9.0-macos15.0 + net9.0-macos; + net10.0-macos diff --git a/Directory.Build.targets b/Directory.Build.targets index d7f89e6e..a351c5f8 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -69,6 +69,7 @@ $(DefineConstants);SUPPORTS_MULTIPLE_VALUES_IN_QUERYHELPERS $(DefineConstants);SUPPORTS_NAMED_PIPE_STATIC_FACTORY_WITH_ACL $(DefineConstants);SUPPORTS_ONE_SHOT_HASHING_METHODS + $(DefineConstants);SUPPORTS_ONE_SHOT_KEY_DERIVATION_METHODS $(DefineConstants);SUPPORTS_ONE_SHOT_RANDOM_NUMBER_GENERATOR_METHODS $(DefineConstants);SUPPORTS_OPERATING_SYSTEM_VERSIONS_COMPARISON $(DefineConstants);SUPPORTS_PEM_ENCODED_KEY_IMPORT @@ -118,6 +119,11 @@ $(DefineConstants);SUPPORTS_TYPE_DESCRIPTOR_TYPE_REGISTRATION + + $(DefineConstants);SUPPORTS_RELAXED_URI_LIMITS + + $(DefineConstants);SUPPORTS_ANDROID diff --git a/Directory.Packages.props b/Directory.Packages.props index f05a9be7..b796a920 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -188,25 +188,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + + .NETCoreApp true + .NETCoreApp false false false diff --git a/test/OpenIddict.Client.IntegrationTests/OpenIddict.Client.IntegrationTests.csproj b/test/OpenIddict.Client.IntegrationTests/OpenIddict.Client.IntegrationTests.csproj index 29e76a9a..902e4012 100644 --- a/test/OpenIddict.Client.IntegrationTests/OpenIddict.Client.IntegrationTests.csproj +++ b/test/OpenIddict.Client.IntegrationTests/OpenIddict.Client.IntegrationTests.csproj @@ -14,6 +14,11 @@ + + + diff --git a/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs b/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs index eb9ec983..b1cdda7c 100644 --- a/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs +++ b/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs @@ -72,6 +72,7 @@ public partial class OpenIddictServerAspNetCoreIntegrationTests : OpenIddictServ await client.GetAsync("/.well-known/openid-configuration", new OpenIddictRequest()); } +#if !SUPPORTS_RELAXED_URI_LIMITS [Fact] public async Task ProcessRequest_IgnoresInvalidRequestUris() { @@ -110,6 +111,7 @@ public partial class OpenIddictServerAspNetCoreIntegrationTests : OpenIddictServ // Act await client.GetAsync("/.well-known/openid-configuration", new OpenIddictRequest()); } +#endif [Fact] public async Task ProcessAuthentication_CreationDateIsMappedToIssuedUtc() diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj b/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj index dcb0caed..0cd569c1 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj @@ -19,6 +19,11 @@ + + + diff --git a/test/OpenIddict.Validation.IntegrationTests/OpenIddict.Validation.IntegrationTests.csproj b/test/OpenIddict.Validation.IntegrationTests/OpenIddict.Validation.IntegrationTests.csproj index 63fc2c3a..fbac1241 100644 --- a/test/OpenIddict.Validation.IntegrationTests/OpenIddict.Validation.IntegrationTests.csproj +++ b/test/OpenIddict.Validation.IntegrationTests/OpenIddict.Validation.IntegrationTests.csproj @@ -18,6 +18,11 @@ + + +