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

Bump the .NET SDK to 10.0.100-rc.2.25502.107 and add .NET 10 TFMs

pull/2394/head
Kévin Chalet 3 months ago
parent
2445813f8c
commit
13f352af6d
18 changed files with 166 additions and 49 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. 20
      Directory.Build.props
  2. 6
      Directory.Build.targets
  3. 67
      Directory.Packages.props
  4. 31
      WorkloadRollback.json
  5. 7
      global.json
  6. 2
      sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj
  7. 2
      sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
  8. 2
      sandbox/OpenIddict.Sandbox.Console.Client/OpenIddict.Sandbox.Console.Client.csproj
  9. 8
      sandbox/OpenIddict.Sandbox.Maui.Client/OpenIddict.Sandbox.Maui.Client.csproj
  10. 3
      sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj
  11. 3
      sandbox/OpenIddict.Sandbox.Wpf.Client/OpenIddict.Sandbox.Wpf.Client.csproj
  12. 27
      shared/OpenIddict.Extensions/OpenIddictHelpers.cs
  13. 10
      src/OpenIddict.Client.SystemIntegration/OpenIddict.Client.SystemIntegration.csproj
  14. 10
      src/OpenIddict/OpenIddict.csproj
  15. 5
      test/OpenIddict.Client.IntegrationTests/OpenIddict.Client.IntegrationTests.csproj
  16. 2
      test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs
  17. 5
      test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
  18. 5
      test/OpenIddict.Validation.IntegrationTests/OpenIddict.Validation.IntegrationTests.csproj

20
Directory.Build.props
View File

@ -20,6 +20,7 @@
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
</PropertyGroup>
@ -105,27 +106,32 @@
<NetCoreTargetFrameworks Condition=" '$(NetCoreTargetFrameworks)' == '' ">
net8.0;
net9.0
net9.0;
net10.0
</NetCoreTargetFrameworks>
<NetCoreAndroidTargetFrameworks
Condition=" '$(NetCoreAndroidTargetFrameworks)' == '' And '$(SupportsAndroidTargeting)' == 'true' ">
net9.0-android35.0
net9.0-android;
net10.0-android
</NetCoreAndroidTargetFrameworks>
<NetCoreIOSTargetFrameworks
Condition=" '$(NetCoreIOSTargetFrameworks)' == '' And '$(SupportsIOSTargeting)' == 'true' ">
net9.0-ios18.0
net9.0-ios;
net10.0-ios
</NetCoreIOSTargetFrameworks>
<NetCoreMacCatalystTargetFrameworks
Condition=" '$(NetCoreMacCatalystTargetFrameworks)' == '' And '$(SupportsMacCatalystTargeting)' == 'true' ">
net9.0-maccatalyst18.0
net9.0-maccatalyst;
net10.0-maccatalyst
</NetCoreMacCatalystTargetFrameworks>
<NetCoreMacOSTargetFrameworks
Condition=" '$(NetCoreMacOSTargetFrameworks)' == '' And '$(SupportsMacOSTargeting)' == 'true' ">
net9.0-macos15.0
net9.0-macos;
net10.0-macos
</NetCoreMacOSTargetFrameworks>
<NetCoreWindowsTargetFrameworks
@ -133,7 +139,9 @@
net8.0-windows7.0;
net8.0-windows10.0.17763;
net9.0-windows7.0;
net9.0-windows10.0.17763
net9.0-windows10.0.17763;
net10.0-windows7.0;
net10.0-windows10.0.17763
</NetCoreWindowsTargetFrameworks>
<NetStandardTargetFrameworks Condition=" '$(NetStandardTargetFrameworks)' == '' ">

6
Directory.Build.targets
View File

@ -69,6 +69,7 @@
<DefineConstants>$(DefineConstants);SUPPORTS_MULTIPLE_VALUES_IN_QUERYHELPERS</DefineConstants>
<DefineConstants>$(DefineConstants);SUPPORTS_NAMED_PIPE_STATIC_FACTORY_WITH_ACL</DefineConstants>
<DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_HASHING_METHODS</DefineConstants>
<DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_KEY_DERIVATION_METHODS</DefineConstants>
<DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_RANDOM_NUMBER_GENERATOR_METHODS</DefineConstants>
<DefineConstants>$(DefineConstants);SUPPORTS_OPERATING_SYSTEM_VERSIONS_COMPARISON</DefineConstants>
<DefineConstants>$(DefineConstants);SUPPORTS_PEM_ENCODED_KEY_IMPORT</DefineConstants>
@ -118,6 +119,11 @@
<DefineConstants>$(DefineConstants);SUPPORTS_TYPE_DESCRIPTOR_TYPE_REGISTRATION</DefineConstants>
</PropertyGroup>
<PropertyGroup
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '10.0')) ">
<DefineConstants>$(DefineConstants);SUPPORTS_RELAXED_URI_LIMITS</DefineConstants>
</PropertyGroup>
<PropertyGroup
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetPlatformIdentifier)' == 'Android' ">
<DefineConstants>$(DefineConstants);SUPPORTS_ANDROID</DefineConstants>

67
Directory.Packages.props
View File

@ -188,25 +188,70 @@
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
<!--
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).
-->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.15.0" />
</ItemGroup>
<!--
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
█████ ▀██ ██ ▄▄▄█▄▄ ▄▄███▀ ██ ▄▄ ████ ▄▄ ██
█▀▀██ █ █ ██ ▄▄▄███ ██████ ██ ▀▄ █▀▀█ ▀▄ ██
█▄▄██ ██▄ ██ ▀▀▀███ █████▀ ▀█ ▀▀ █▄▄█ ▀▀ ██
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
-->
<ItemGroup Label="Package versions for .NET 10.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) ">
<PackageVersion Include="EntityFramework" Version="6.5.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="MongoDB.Bson" Version="3.5.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.9.0" />
<!--
Note: the following references are exclusively used in the test projects:
-->
<PackageVersion Include="AngleSharp" Version="1.3.0" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Moq" Version="4.18.4" />
<!--
Note: the following references are exclusively used in the samples:
-->
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.120" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageVersion Include="Spectre.Console" Version="0.53.0" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.0-rc.2.25504.7" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.0-rc.2.25504.7" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageVersion Include="Spectre.Console" Version="0.53.0" />
<!--
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).
-->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.15.0" />
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.15.0" />
</ItemGroup>
<!--

31
WorkloadRollback.json
View File

@ -1,17 +1,18 @@
{
"microsoft.net.sdk.android": "35.0.78/9.0.100",
"microsoft.net.sdk.ios": "26.0.9752/9.0.100",
"microsoft.net.sdk.maccatalyst": "26.0.9752/9.0.100",
"microsoft.net.sdk.macos": "26.0.9752/9.0.100",
"microsoft.net.sdk.maui": "9.0.111/9.0.100",
"microsoft.net.sdk.tvos": "26.0.9752/9.0.100",
"microsoft.net.workload.mono.toolchain.current": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.current": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.net6": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.net7": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.net8": "9.0.10/9.0.100",
"microsoft.net.workload.mono.toolchain.net6": "9.0.10/9.0.100",
"microsoft.net.workload.mono.toolchain.net7": "9.0.10/9.0.100",
"microsoft.net.workload.mono.toolchain.net8": "9.0.10/9.0.100",
"microsoft.net.sdk.aspire": "8.2.2/8.0.100"
"microsoft.net.sdk.android": "36.0.0-rc.2.332/10.0.100-rc.2",
"microsoft.net.sdk.ios": "26.0.10970-net10-rc.2/10.0.100-rc.2",
"microsoft.net.sdk.maccatalyst": "26.0.10970-net10-rc.2/10.0.100-rc.2",
"microsoft.net.sdk.macos": "26.0.10970-net10-rc.2/10.0.100-rc.2",
"microsoft.net.sdk.maui": "10.0.0-rc.2.25504.7/10.0.100-rc.2",
"microsoft.net.sdk.tvos": "26.0.10970-net10-rc.2/10.0.100-rc.2",
"microsoft.net.workload.mono.toolchain.current": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.emscripten.current": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.emscripten.net6": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.emscripten.net7": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.emscripten.net8": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.emscripten.net9": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.mono.toolchain.net6": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.mono.toolchain.net7": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.mono.toolchain.net8": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
"microsoft.net.workload.mono.toolchain.net9": "10.0.100-rc.2.25502.107/10.0.100-rc.2"
}

7
global.json
View File

@ -1,16 +1,17 @@
{
"sdk": {
"version": "9.0.306",
"version": "10.0.100-rc.2.25502.107",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "9.0.306",
"dotnet": "10.0.100-rc.2.25502.107",
"runtimes": {
"aspnetcore": [
"8.0.21"
"8.0.21",
"9.0.10"
]
}
},

2
sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net48;net9.0</TargetFrameworks>
<TargetFrameworks>net48;net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net48;net9.0</TargetFrameworks>
<TargetFrameworks>net48;net10.0</TargetFrameworks>
<TypeScriptEnabled>false</TypeScriptEnabled>
</PropertyGroup>

2
sandbox/OpenIddict.Sandbox.Console.Client/OpenIddict.Sandbox.Console.Client.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net48;net9.0</TargetFrameworks>
<TargetFrameworks>net48;net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

8
sandbox/OpenIddict.Sandbox.Maui.Client/OpenIddict.Sandbox.Maui.Client.csproj
View File

@ -2,11 +2,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">net9.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsIOSTargeting)' == 'true' ">$(TargetFrameworks);net9.0-ios18.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsMacCatalystTargeting)' == 'true' ">$(TargetFrameworks);net9.0-maccatalyst18.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">net10.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsIOSTargeting)' == 'true' ">$(TargetFrameworks);net10.0-ios</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsMacCatalystTargeting)' == 'true' ">$(TargetFrameworks);net10.0-maccatalyst</TargetFrameworks>
<UseMaui Condition=" '$(TargetFrameworks)' != '' ">true</UseMaui>
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net9.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net10.0</TargetFrameworks>
<SingleProject>true</SingleProject>
</PropertyGroup>

3
sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net48</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">$(TargetFrameworks);net9.0-windows7.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">$(TargetFrameworks);net10.0-windows7.0</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
@ -20,6 +20,7 @@
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" />
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
</ItemGroup>
</Project>

3
sandbox/OpenIddict.Sandbox.Wpf.Client/OpenIddict.Sandbox.Wpf.Client.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net48</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">$(TargetFrameworks);net9.0-windows10.0.17763</TargetFrameworks>
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">$(TargetFrameworks);net10.0-windows10.0.17763</TargetFrameworks>
<UseWPF>true</UseWPF>
<EnableDefaultApplicationDefinition>false</EnableDefaultApplicationDefinition>
</PropertyGroup>
@ -19,6 +19,7 @@
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" />
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
</ItemGroup>
</Project>

27
shared/OpenIddict.Extensions/OpenIddictHelpers.cs
View File

@ -1039,18 +1039,35 @@ internal static class OpenIddictHelpers
{
// Warning: the type and order of the arguments specified here MUST exactly match the parameters used with
// Rfc2898DeriveBytes(string password, byte[] salt, int iterations, HashAlgorithmName hashAlgorithm).
using var generator = GetAlgorithmFromConfig(secret, salt, iterations, algorithm) switch
var generator = GetAlgorithmFromConfig(secret, salt, iterations, algorithm) switch
{
Rfc2898DeriveBytes result => result,
null => null,
var result => throw new CryptographicException(SR.FormatID0351(result.GetType().FullName))
};
// If no custom generator was registered, use either the static/one-shot Pbkdf2() API
// on platforms that support it or create an instance using the dedicated constructor.
if (generator is null)
{
#if SUPPORTS_ONE_SHOT_KEY_DERIVATION_METHODS
return Rfc2898DeriveBytes.Pbkdf2(secret, salt, iterations, algorithm, length);
#else
#pragma warning disable CA5379
null => new Rfc2898DeriveBytes(secret, salt, iterations, algorithm),
generator = new Rfc2898DeriveBytes(secret, salt, iterations, algorithm);
#pragma warning restore CA5379
#endif
}
var result => throw new CryptographicException(SR.FormatID0351(result.GetType().FullName))
};
try
{
return generator.GetBytes(length);
}
return generator.GetBytes(length);
finally
{
generator.Dispose();
}
[UnconditionalSuppressMessage("Trimming", "IL2026",
Justification = "The default implementation is always used when no custom algorithm was registered.")]

10
src/OpenIddict.Client.SystemIntegration/OpenIddict.Client.SystemIntegration.csproj
View File

@ -12,6 +12,16 @@
$(NetStandardTargetFrameworks);
$(UniversalWindowsPlatformTargetFrameworks)
</TargetFrameworks>
<!--
Note: MSBuild.Sdk.Extras has a bug that prevents the target framework identifier from being
correctly inferred for .NET 10+ target framework monikers. To work around that bug, the identifier
is explicitly set when the moniker corresponds to a .NET (Core) target framework moniker.
See https://github.com/novotnyllc/MSBuildSdkExtras/issues/305 for more information.
-->
<TargetFrameworkIdentifier
Condition=" $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp' ">.NETCoreApp</TargetFrameworkIdentifier>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!--

10
src/OpenIddict/OpenIddict.csproj
View File

@ -12,6 +12,16 @@
$(NetStandardTargetFrameworks);
$(UniversalWindowsPlatformTargetFrameworks)
</TargetFrameworks>
<!--
Note: MSBuild.Sdk.Extras has a bug that prevents the target framework identifier from being
correctly inferred for .NET 10+ target framework monikers. To work around that bug, the identifier
is explicitly set when the moniker corresponds to a .NET (Core) target framework moniker.
See https://github.com/novotnyllc/MSBuildSdkExtras/issues/305 for more information.
-->
<TargetFrameworkIdentifier
Condition=" $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp' ">.NETCoreApp</TargetFrameworkIdentifier>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<IncludeInternalExtensions>false</IncludeInternalExtensions>

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

@ -14,6 +14,11 @@
<PackageReference Include="MartinCostello.Logging.XUnit" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '10.0'))) ">
<PackageReference Include="System.Linq.Async" />
</ItemGroup>

2
test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs
View File

@ -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()

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

@ -19,6 +19,11 @@
<PackageReference Include="MartinCostello.Logging.XUnit" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '10.0'))) ">
<PackageReference Include="System.Linq.Async" />
</ItemGroup>

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

@ -18,6 +18,11 @@
<PackageReference Include="MartinCostello.Logging.XUnit" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '10.0'))) ">
<PackageReference Include="System.Linq.Async" />
</ItemGroup>

Write Preview
Loading…
Cancel
Save