WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 13f352a

Browse files
kevinchaletkevinchalet
committed
Bump the .NET SDK to 10.0.100-rc.2.25502.107 and add .NET 10 TFMs
1 parent 2445813 commit 13f352a

File tree

18 files changed

+166
-49
lines changed

18 files changed

+166
-49
lines changed

‎Directory.Build.props‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
2121
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
2222
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
23+
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
2324
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
2425
</PropertyGroup>
2526

@@ -105,35 +106,42 @@
105106

106107
<NetCoreTargetFrameworks Condition=" '$(NetCoreTargetFrameworks)' == '' ">
107108
net8.0;
108-
net9.0
109+
net9.0;
110+
net10.0
109111
</NetCoreTargetFrameworks>
110112

111113
<NetCoreAndroidTargetFrameworks
112114
Condition=" '$(NetCoreAndroidTargetFrameworks)' == '' And '$(SupportsAndroidTargeting)' == 'true' ">
113-
net9.0-android35.0
115+
net9.0-android;
116+
net10.0-android
114117
</NetCoreAndroidTargetFrameworks>
115118

116119
<NetCoreIOSTargetFrameworks
117120
Condition=" '$(NetCoreIOSTargetFrameworks)' == '' And '$(SupportsIOSTargeting)' == 'true' ">
118-
net9.0-ios18.0
121+
net9.0-ios;
122+
net10.0-ios
119123
</NetCoreIOSTargetFrameworks>
120124

121125
<NetCoreMacCatalystTargetFrameworks
122126
Condition=" '$(NetCoreMacCatalystTargetFrameworks)' == '' And '$(SupportsMacCatalystTargeting)' == 'true' ">
123-
net9.0-maccatalyst18.0
127+
net9.0-maccatalyst;
128+
net10.0-maccatalyst
124129
</NetCoreMacCatalystTargetFrameworks>
125130

126131
<NetCoreMacOSTargetFrameworks
127132
Condition=" '$(NetCoreMacOSTargetFrameworks)' == '' And '$(SupportsMacOSTargeting)' == 'true' ">
128-
net9.0-macos15.0
133+
net9.0-macos;
134+
net10.0-macos
129135
</NetCoreMacOSTargetFrameworks>
130136

131137
<NetCoreWindowsTargetFrameworks
132138
Condition=" '$(NetCoreWindowsTargetFrameworks)' == '' And '$(SupportsWindowsTargeting)' == 'true' ">
133139
net8.0-windows7.0;
134140
net8.0-windows10.0.17763;
135141
net9.0-windows7.0;
136-
net9.0-windows10.0.17763
142+
net9.0-windows10.0.17763;
143+
net10.0-windows7.0;
144+
net10.0-windows10.0.17763
137145
</NetCoreWindowsTargetFrameworks>
138146

139147
<NetStandardTargetFrameworks Condition=" '$(NetStandardTargetFrameworks)' == '' ">

‎Directory.Build.targets‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<DefineConstants>$(DefineConstants);SUPPORTS_MULTIPLE_VALUES_IN_QUERYHELPERS</DefineConstants>
7070
<DefineConstants>$(DefineConstants);SUPPORTS_NAMED_PIPE_STATIC_FACTORY_WITH_ACL</DefineConstants>
7171
<DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_HASHING_METHODS</DefineConstants>
72+
<DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_KEY_DERIVATION_METHODS</DefineConstants>
7273
<DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_RANDOM_NUMBER_GENERATOR_METHODS</DefineConstants>
7374
<DefineConstants>$(DefineConstants);SUPPORTS_OPERATING_SYSTEM_VERSIONS_COMPARISON</DefineConstants>
7475
<DefineConstants>$(DefineConstants);SUPPORTS_PEM_ENCODED_KEY_IMPORT</DefineConstants>
@@ -118,6 +119,11 @@
118119
<DefineConstants>$(DefineConstants);SUPPORTS_TYPE_DESCRIPTOR_TYPE_REGISTRATION</DefineConstants>
119120
</PropertyGroup>
120121

122+
<PropertyGroup
123+
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '10.0')) ">
124+
<DefineConstants>$(DefineConstants);SUPPORTS_RELAXED_URI_LIMITS</DefineConstants>
125+
</PropertyGroup>
126+
121127
<PropertyGroup
122128
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetPlatformIdentifier)' == 'Android' ">
123129
<DefineConstants>$(DefineConstants);SUPPORTS_ANDROID</DefineConstants>

‎Directory.Packages.props‎

Lines changed: 56 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -188,25 +188,70 @@
188188
<PackageVersion Include="Moq" Version="4.18.4" />
189189
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
190190

191+
<!--
192+
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
193+
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
194+
-->
195+
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.15.0" />
196+
</ItemGroup>
197+
198+
<!--
199+
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
200+
█████ ▀██ ██ ▄▄▄█▄▄ ▄▄███▀ ██ ▄▄ ████ ▄▄ ██
201+
█▀▀██ █ █ ██ ▄▄▄███ ██████ ██ ▀▄ █▀▀█ ▀▄ ██
202+
█▄▄██ ██▄ ██ ▀▀▀███ █████▀ ▀█ ▀▀ █▄▄█ ▀▀ ██
203+
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
204+
-->
205+
206+
<ItemGroup Label="Package versions for .NET 10.0"
207+
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) ">
208+
<PackageVersion Include="EntityFramework" Version="6.5.1" />
209+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-rc.2.25502.107" />
210+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25502.107" />
211+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.2.25502.107" />
212+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-rc.2.25502.107" />
213+
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.0-rc.2.25502.107" />
214+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
215+
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
216+
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.14.0" />
217+
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
218+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25502.107" />
219+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-rc.2.25502.107" />
220+
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.0-rc.2.25502.107" />
221+
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="10.0.0-rc.2.25502.107" />
222+
<PackageVersion Include="MongoDB.Bson" Version="3.5.0" />
223+
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
224+
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
225+
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.9.0" />
226+
227+
<!--
228+
Note: the following references are exclusively used in the test projects:
229+
-->
230+
<PackageVersion Include="AngleSharp" Version="1.3.0" />
231+
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
232+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.2.25502.107" />
233+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
234+
<PackageVersion Include="Moq" Version="4.18.4" />
235+
191236
<!--
192237
Note: the following references are exclusively used in the samples:
193238
-->
194-
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
195-
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
196-
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
197-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
198-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
199-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
200-
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.120" />
201-
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
202-
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
203-
<PackageVersion Include="Spectre.Console" Version="0.53.0" />
239+
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
240+
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
241+
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
242+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0-rc.2.25502.107" />
243+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-rc.2.25502.107" />
244+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107" />
245+
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.0-rc.2.25504.7" />
246+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.0-rc.2.25504.7" />
247+
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
248+
<PackageVersion Include="Spectre.Console" Version="0.53.0" />
204249

205250
<!--
206251
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
207252
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
208253
-->
209-
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.15.0" />
254+
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.15.0" />
210255
</ItemGroup>
211256

212257
<!--

‎WorkloadRollback.json‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{
2-
"microsoft.net.sdk.android": "35.0.78/9.0.100",
3-
"microsoft.net.sdk.ios": "26.0.9752/9.0.100",
4-
"microsoft.net.sdk.maccatalyst": "26.0.9752/9.0.100",
5-
"microsoft.net.sdk.macos": "26.0.9752/9.0.100",
6-
"microsoft.net.sdk.maui": "9.0.111/9.0.100",
7-
"microsoft.net.sdk.tvos": "26.0.9752/9.0.100",
8-
"microsoft.net.workload.mono.toolchain.current": "9.0.10/9.0.100",
9-
"microsoft.net.workload.emscripten.current": "9.0.10/9.0.100",
10-
"microsoft.net.workload.emscripten.net6": "9.0.10/9.0.100",
11-
"microsoft.net.workload.emscripten.net7": "9.0.10/9.0.100",
12-
"microsoft.net.workload.emscripten.net8": "9.0.10/9.0.100",
13-
"microsoft.net.workload.mono.toolchain.net6": "9.0.10/9.0.100",
14-
"microsoft.net.workload.mono.toolchain.net7": "9.0.10/9.0.100",
15-
"microsoft.net.workload.mono.toolchain.net8": "9.0.10/9.0.100",
16-
"microsoft.net.sdk.aspire": "8.2.2/8.0.100"
2+
"microsoft.net.sdk.android": "36.0.0-rc.2.332/10.0.100-rc.2",
3+
"microsoft.net.sdk.ios": "26.0.10970-net10-rc.2/10.0.100-rc.2",
4+
"microsoft.net.sdk.maccatalyst": "26.0.10970-net10-rc.2/10.0.100-rc.2",
5+
"microsoft.net.sdk.macos": "26.0.10970-net10-rc.2/10.0.100-rc.2",
6+
"microsoft.net.sdk.maui": "10.0.0-rc.2.25504.7/10.0.100-rc.2",
7+
"microsoft.net.sdk.tvos": "26.0.10970-net10-rc.2/10.0.100-rc.2",
8+
"microsoft.net.workload.mono.toolchain.current": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
9+
"microsoft.net.workload.emscripten.current": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
10+
"microsoft.net.workload.emscripten.net6": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
11+
"microsoft.net.workload.emscripten.net7": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
12+
"microsoft.net.workload.emscripten.net8": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
13+
"microsoft.net.workload.emscripten.net9": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
14+
"microsoft.net.workload.mono.toolchain.net6": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
15+
"microsoft.net.workload.mono.toolchain.net7": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
16+
"microsoft.net.workload.mono.toolchain.net8": "10.0.100-rc.2.25502.107/10.0.100-rc.2",
17+
"microsoft.net.workload.mono.toolchain.net9": "10.0.100-rc.2.25502.107/10.0.100-rc.2"
1718
}

‎global.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
22
"sdk": {
3-
"version": "9.0.306",
3+
"version": "10.0.100-rc.2.25502.107",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77

88
"tools": {
9-
"dotnet": "9.0.306",
9+
"dotnet": "10.0.100-rc.2.25502.107",
1010

1111
"runtimes": {
1212
"aspnetcore": [
13-
"8.0.21"
13+
"8.0.21",
14+
"9.0.10"
1415
]
1516
}
1617
},

‎sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net10.0</TargetFrameworks>
55
<TypeScriptEnabled>false</TypeScriptEnabled>
66
</PropertyGroup>
77

‎sandbox/OpenIddict.Sandbox.Console.Client/OpenIddict.Sandbox.Console.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net48;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net48;net10.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎sandbox/OpenIddict.Sandbox.Maui.Client/OpenIddict.Sandbox.Maui.Client.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">net9.0-windows10.0.19041</TargetFrameworks>
6-
<TargetFrameworks Condition=" '$(SupportsIOSTargeting)' == 'true' ">$(TargetFrameworks);net9.0-ios18.0</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(SupportsMacCatalystTargeting)' == 'true' ">$(TargetFrameworks);net9.0-maccatalyst18.0</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">net10.0-windows10.0.19041</TargetFrameworks>
6+
<TargetFrameworks Condition=" '$(SupportsIOSTargeting)' == 'true' ">$(TargetFrameworks);net10.0-ios</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(SupportsMacCatalystTargeting)' == 'true' ">$(TargetFrameworks);net10.0-maccatalyst</TargetFrameworks>
88
<UseMaui Condition=" '$(TargetFrameworks)' != '' ">true</UseMaui>
9-
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net9.0</TargetFrameworks>
9+
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net10.0</TargetFrameworks>
1010
<SingleProject>true</SingleProject>
1111
</PropertyGroup>
1212

‎sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
55
<TargetFrameworks>net48</TargetFrameworks>
6-
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">$(TargetFrameworks);net9.0-windows7.0</TargetFrameworks>
6+
<TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">$(TargetFrameworks);net10.0-windows7.0</TargetFrameworks>
77
<UseWindowsForms>true</UseWindowsForms>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
@@ -20,6 +20,7 @@
2020
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" />
2121
<PackageReference Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
23+
<PackageReference Include="Microsoft.Extensions.Hosting" />
2324
</ItemGroup>
2425

2526
</Project>

0 commit comments

Comments
 (0)