Browse Source

Bump the .NET SDK to 9.0.100 and reference the 9.0 RTM packages

pull/2224/head
Kévin Chalet 1 year ago
parent
commit
4a9b590494
  1. 6
      Directory.Build.targets
  2. 76
      Directory.Packages.props
  3. 30
      WorkloadRollback.json
  4. 4
      global.json
  5. 2
      src/OpenIddict.Abstractions/Primitives/OpenIddictParameter.cs

6
Directory.Build.targets

@ -24,17 +24,17 @@
<SupportedOSPlatformVersion <SupportedOSPlatformVersion
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And
'$(TargetPlatformIdentifier)' == 'iOS' And '$(TargetPlatformVersion)' != '' And '$(TargetPlatformIdentifier)' == 'iOS' And '$(TargetPlatformVersion)' != '' And
$([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '12.0'))) ">12.0</SupportedOSPlatformVersion> $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '12.2'))) ">12.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion <SupportedOSPlatformVersion
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And
'$(TargetPlatformIdentifier)' == 'MacCatalyst' And '$(TargetPlatformVersion)' != '' And '$(TargetPlatformIdentifier)' == 'MacCatalyst' And '$(TargetPlatformVersion)' != '' And
$([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '13.1'))) ">13.1</SupportedOSPlatformVersion> $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '15.0'))) ">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion <SupportedOSPlatformVersion
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And
'$(TargetPlatformIdentifier)' == 'macOS' And '$(TargetPlatformVersion)' != '' And '$(TargetPlatformIdentifier)' == 'macOS' And '$(TargetPlatformVersion)' != '' And
$([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '10.15'))) ">10.15</SupportedOSPlatformVersion> $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '12.0'))) ">12.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion <SupportedOSPlatformVersion
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0')) And

76
Directory.Packages.props

@ -321,57 +321,57 @@
<ItemGroup Label="Package versions for .NET 9.0" <ItemGroup Label="Package versions for .NET 9.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) "> Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<PackageVersion Include="EntityFramework" Version="6.5.1" /> <PackageVersion Include="EntityFramework" Version="6.5.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0-rc.2.24474.1" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24474.3" /> <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.9.24507.7" /> <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="9.0.0-rc.2.24474.3" /> <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="9.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" /> <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.1.2" /> <PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.1.2" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.1.2" /> <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.1.2" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="9.0.0-rc.2.24474.3" /> <PackageVersion Include="Microsoft.Net.Http.Headers" Version="9.0.0" />
<PackageVersion Include="MongoDB.Bson" Version="3.0.0" /> <PackageVersion Include="MongoDB.Bson" Version="3.0.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.0.0" /> <PackageVersion Include="MongoDB.Driver" Version="3.0.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.13.0" /> <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.13.0" />
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.8.0.6" /> <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.8.0.6" />
<!-- <!--
Note: the following references are exclusively used in the test projects: Note: the following references are exclusively used in the test projects:
--> -->
<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="9.0.0-rc.2.24474.3" /> <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Moq" Version="4.18.4" /> <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.14" /> <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.WinForms" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" /> <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-rc.2.24474.3" /> <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-rc.2.24474.1" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" /> <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.0-rc.2.24503.2" /> <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.0" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.0-rc.2.24503.2" /> <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.0" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.13.0" /> <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.13.0" />
<PackageVersion Include="Spectre.Console" Version="0.48.0" /> <PackageVersion Include="Spectre.Console" Version="0.48.0" />
<!-- <!--
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.13.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!-- <!--

30
WorkloadRollback.json

@ -1,17 +1,17 @@
{ {
"microsoft.net.sdk.android": "35.0.0-rc.2.152/9.0.100-rc.2", "microsoft.net.sdk.android": "35.0.7/9.0.100",
"microsoft.net.sdk.ios": "18.0.9600-net9-rc2/9.0.100-rc.2", "microsoft.net.sdk.ios": "18.0.9617/9.0.100",
"microsoft.net.sdk.maccatalyst": "18.0.9600-net9-rc2/9.0.100-rc.2", "microsoft.net.sdk.maccatalyst": "18.0.9617/9.0.100",
"microsoft.net.sdk.macos": "15.0.9600-net9-rc2/9.0.100-rc.2", "microsoft.net.sdk.macos": "15.0.9617/9.0.100",
"microsoft.net.sdk.maui": "9.0.0-rc.2.24503.2/9.0.100-rc.2", "microsoft.net.sdk.maui": "9.0.0/9.0.100",
"microsoft.net.sdk.tvos": "18.0.9600-net9-rc2/9.0.100-rc.2", "microsoft.net.sdk.tvos": "18.0.9617/9.0.100",
"microsoft.net.workload.mono.toolchain.current": "9.0.0-rc.2.24473.5/9.0.100-rc.2", "microsoft.net.workload.mono.toolchain.current": "9.0.0/9.0.100",
"microsoft.net.workload.emscripten.current": "9.0.0-rc.2.24468.8/9.0.100-rc.2", "microsoft.net.workload.emscripten.current": "9.0.0/9.0.100",
"microsoft.net.workload.emscripten.net6": "9.0.0-rc.2.24468.8/9.0.100-rc.2", "microsoft.net.workload.emscripten.net6": "9.0.0/9.0.100",
"microsoft.net.workload.emscripten.net7": "9.0.0-rc.2.24468.8/9.0.100-rc.2", "microsoft.net.workload.emscripten.net7": "9.0.0/9.0.100",
"microsoft.net.workload.emscripten.net8": "9.0.0-rc.2.24468.8/9.0.100-rc.2", "microsoft.net.workload.emscripten.net8": "9.0.0/9.0.100",
"microsoft.net.workload.mono.toolchain.net6": "9.0.0-rc.2.24473.5/9.0.100-rc.2", "microsoft.net.workload.mono.toolchain.net6": "9.0.0/9.0.100",
"microsoft.net.workload.mono.toolchain.net7": "9.0.0-rc.2.24473.5/9.0.100-rc.2", "microsoft.net.workload.mono.toolchain.net7": "9.0.0/9.0.100",
"microsoft.net.workload.mono.toolchain.net8": "9.0.0-rc.2.24473.5/9.0.100-rc.2", "microsoft.net.workload.mono.toolchain.net8": "9.0.0/9.0.100",
"microsoft.net.sdk.aspire": "8.2.0/8.0.100" "microsoft.net.sdk.aspire": "8.2.2/8.0.100"
} }

4
global.json

@ -1,12 +1,12 @@
{ {
"sdk": { "sdk": {
"version": "9.0.100-rc.2.24474.11", "version": "9.0.100",
"allowPrerelease": true, "allowPrerelease": true,
"rollForward": "major" "rollForward": "major"
}, },
"tools": { "tools": {
"dotnet": "9.0.100-rc.2.24474.11", "dotnet": "9.0.100",
"runtimes": { "runtimes": {
"aspnetcore": [ "aspnetcore": [

2
src/OpenIddict.Abstractions/Primitives/OpenIddictParameter.cs

@ -200,7 +200,7 @@ public readonly struct OpenIddictParameter : IEquatable<OpenIddictParameter>
(string left, string right) => string.Equals(left, right, StringComparison.Ordinal), (string left, string right) => string.Equals(left, right, StringComparison.Ordinal),
// If the two parameters are string arrays, use SequenceEqual(). // If the two parameters are string arrays, use SequenceEqual().
(string?[] left, string?[] right) => left.SequenceEqual(right), (string?[] left, string?[] right) => Enumerable.SequenceEqual(left, right),
// If one of the two parameters is an undefined JsonElement, treat it // If one of the two parameters is an undefined JsonElement, treat it
// as a null value and return true if the other parameter is null too. // as a null value and return true if the other parameter is null too.

Loading…
Cancel
Save