Skip to content

Commit 292d0a8

Browse files
kevinchaletkevinchalet
committed
Migrate the solution to .NET 10 and bump OpenIddict to 7.2.0
1 parent 6f4c36b commit 292d0a8

File tree

10 files changed

+47
-47
lines changed

10 files changed

+47
-47
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
Condition=" '$(NetFrameworkTargetFramework)' == '' ">net48</NetFrameworkTargetFramework>
3737

3838
<NetCoreTargetFramework
39-
Condition=" '$(NetCoreTargetFramework)' == '' ">net9.0</NetCoreTargetFramework>
39+
Condition=" '$(NetCoreTargetFramework)' == '' ">net10.0</NetCoreTargetFramework>
4040

4141
<NetCoreWindowsTargetFramework
42-
Condition=" '$(NetCoreWindowsTargetFramework)' == '' ">net9.0-windows</NetCoreWindowsTargetFramework>
42+
Condition=" '$(NetCoreWindowsTargetFramework)' == '' ">net10.0-windows</NetCoreWindowsTargetFramework>
4343
</PropertyGroup>
4444

4545
<!--

‎Directory.Packages.props‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -44,60 +44,58 @@
4444
<PackageVersion Include="Microsoft.Owin.Security.OAuth" Version="4.2.3" />
4545
<PackageVersion Include="Microsoft.Web.Infrastructure" Version="2.0.1" />
4646
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
47-
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="7.0.0" />
48-
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="7.0.0" />
49-
<PackageVersion Include="OpenIddict.EntityFramework" Version="7.0.0" />
50-
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.0.0" />
51-
<PackageVersion Include="OpenIddict.Owin" Version="7.0.0" />
47+
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="7.2.0" />
48+
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="7.2.0" />
49+
<PackageVersion Include="OpenIddict.EntityFramework" Version="7.2.0" />
50+
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.2.0" />
51+
<PackageVersion Include="OpenIddict.Owin" Version="7.2.0" />
5252
<PackageVersion Include="WebGrease" Version="1.6.0" />
5353
</ItemGroup>
5454

5555
<!--
56-
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
57-
█████ ▀██ ██ ▄▄▄█▄▄ ▄▄███▀▄▄▀████ ▄▄ ██
58-
█▀▀██ █ █ ██ ▄▄▄███ █████▄▀▀ █▀▀█ ▀▄ ██
59-
█▄▄██ ██▄ ██ ▀▀▀███ ██████▀▀▄█▄▄█ ▀▀ ██
60-
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
56+
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
57+
█████ ▀██ ██ ▄▄▄█▄▄ ▄▄███▀ ██ ▄▄ ████ ▄▄ ██
58+
█▀▀██ █ █ ██ ▄▄▄███ ██████ ██ ▀▄ █▀▀█ ▀▄ ██
59+
█▄▄██ ██▄ ██ ▀▀▀███ █████▀ ▀█ ▀▀ █▄▄█ ▀▀ ██
60+
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
6161
-->
6262

63-
<ItemGroup Label="Package versions for .NET 9.0"
64-
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0'))) ">
63+
<ItemGroup Label="Package versions for .NET 10.0"
64+
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0'))) ">
6565
<!--
66-
Note: the following references are exclusively used in the .NET 9.0 and ASP.NET Core 9.0 samples:
66+
Note: the following references are exclusively used in the .NET 10.0 and ASP.NET Core 10.0 samples:
6767
-->
6868
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
6969
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
7070
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
71-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.10" />
72-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.10" />
73-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.10" />
71+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="10.0.0" />
72+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
73+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.0" />
7474
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
75-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.10" />
76-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.10" />
77-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="9.0.120" />
78-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.10" />
79-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
80-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.10" />
81-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.10" />
75+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" />
76+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" />
77+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="10.0.0" />
78+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" />
79+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
80+
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
81+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.0" />
8282
<PackageVersion Include="Microsoft.Build" Version="17.14.28" />
83-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
84-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10" />
85-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
86-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
87-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.10" />
88-
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
89-
<PackageVersion Include="OpenIddict.Abstractions" Version="7.0.0" />
90-
<PackageVersion Include="OpenIddict.AspNetCore" Version="7.0.0" />
91-
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="7.0.0" />
92-
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="7.0.0" />
93-
<PackageVersion Include="OpenIddict.Client.WebIntegration" Version="7.0.0" />
94-
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.0.0" />
95-
<PackageVersion Include="OpenIddict.Quartz" Version="7.0.0" />
96-
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.0.0" />
97-
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.0.0" />
83+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
84+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
85+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
86+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
87+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
88+
<PackageVersion Include="OpenIddict.Abstractions" Version="7.2.0" />
89+
<PackageVersion Include="OpenIddict.AspNetCore" Version="7.2.0" />
90+
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="7.2.0" />
91+
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="7.2.0" />
92+
<PackageVersion Include="OpenIddict.Client.WebIntegration" Version="7.2.0" />
93+
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.2.0" />
94+
<PackageVersion Include="OpenIddict.Quartz" Version="7.2.0" />
95+
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.2.0" />
96+
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.2.0" />
9897
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
9998
<PackageVersion Include="Spectre.Console" Version="0.51.1" />
100-
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
10199
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
102100
</ItemGroup>
103101

‎global.json‎

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

88
"tools": {
9-
"dotnet": "9.0.306"
9+
"dotnet": "10.0.100"
1010
},
1111

1212
"msbuild-sdks": {

‎samples/Dantooine/Dantooine.Server/Dantooine.Server.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<PackageReference Include="Microsoft.Build" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
2020
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" />
21-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
2221
<PackageReference Include="OpenIddict.AspNetCore" />
2322
<PackageReference Include="OpenIddict.EntityFrameworkCore" />
2423
<PackageReference Include="OpenIddict.Quartz" />

‎samples/Matty/Matty.Server/Matty.Server.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<PackageReference Include="Microsoft.Build" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
2020
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" />
21-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
2221
<PackageReference Include="OpenIddict.AspNetCore" />
2322
<PackageReference Include="OpenIddict.EntityFrameworkCore" />
2423
<PackageReference Include="OpenIddict.Quartz" />

‎samples/Velusia/Velusia.Server/Velusia.Server.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<PackageReference Include="Microsoft.Build" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
2020
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" />
21-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
2221
<PackageReference Include="OpenIddict.AspNetCore" />
2322
<PackageReference Include="OpenIddict.EntityFrameworkCore" />
2423
<PackageReference Include="OpenIddict.Quartz" />

‎samples/Zirku/Zirku.Api1/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,6 @@
4444

4545
app.MapGet("api", [Authorize] (ClaimsPrincipal user) => $"{user.Identity!.Name} is allowed to access Api1.");
4646

47+
app.UseWelcomePage();
48+
4749
app.Run();

‎samples/Zirku/Zirku.Api2/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,6 @@
4848

4949
app.MapGet("api", [Authorize] (ClaimsPrincipal user) => $"{user.Identity!.Name} is allowed to access Api2.");
5050

51+
app.UseWelcomePage();
52+
5153
app.Run();

‎samples/Zirku/Zirku.Server/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,4 +287,6 @@ await manager.CreateAsync(new OpenIddictScopeDescriptor
287287
return Results.SignIn(new ClaimsPrincipal(identity), properties: null, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
288288
});
289289

290+
app.UseWelcomePage();
291+
290292
app.Run();

‎samples/Zirku/Zirku.Server/Zirku.Server.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<PackageReference Include="OpenIddict.EntityFrameworkCore" />
1919
<PackageReference Include="OpenIddict.Quartz" />
2020
<PackageReference Include="Quartz.Extensions.Hosting" />
21-
<PackageReference Include="System.Linq.Async" />
2221
</ItemGroup>
2322

2423
</Project>

0 commit comments

Comments
 (0)