From 3d5742293dd6f6c685de68e8aafc603dd45f190d Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 08:27:35 +0000 Subject: [PATCH] chore: migrate .NET 6/8 projects to .NET 9 - Update TargetFramework from net6.0/net8.0 to net9.0 in 17 .csproj files - Upgrade Microsoft.EntityFrameworkCore.* packages to 9.0.16 - Upgrade Microsoft.AspNetCore.* packages to 9.0.16 - Upgrade Microsoft.Data.SqlClient to 7.0.1 - Upgrade Microsoft.IdentityModel.* and System.IdentityModel.* to 8.18.0 - Upgrade System.Drawing.Common to 9.0.16 - Upgrade NuGet.Common/Protocol to 7.6.0 - Update README prerequisites to .NET 9.0 SDK - Update actions/checkout to v4 in CI workflow - .NET Framework 4.x projects intentionally left unchanged Co-Authored-By: Joao Esteves --- .github/workflows/archive2cdn.yml | 2 +- .../AdHocReporting.Server.csproj | 12 +++---- AspNetCore/Angular/AdHocReporting/README.md | 2 +- .../EqDemo.Angular.AdvancedSearch.csproj | 16 +++++----- ...mo.BlazorWasm.AdhocReporting.Client.csproj | 12 +++---- ...mo.BlazorWasm.AdhocReporting.Server.csproj | 32 +++++++++---------- ...mo.BlazorWasm.AdhocReporting.Shared.csproj | 2 +- .../EqDemo.BlazorServer.AdvancedSearch.csproj | 16 +++++----- .../EqDemo.AspNetCoreMvc.DataFiltering.csproj | 10 +++--- ...Demo.AspNetCoreRazor.AdhocReporting.csproj | 12 +++---- ...Demo.AspNetCoreRazor.AdvancedSearch.csproj | 12 +++---- ...qDemo.AspNetCoreRazor.DataFiltering.csproj | 8 ++--- ...tCoreRazorTypeScript.AdhocReporting.csproj | 14 ++++---- ...Demo.AspNetCoreReact.AdvancedSearch.csproj | 16 +++++----- ...mo.AspNetCoreStencil.AdvancedSearch.csproj | 18 +++++------ ...qDemo.AspNetCoreVue2.AdvancedSearch.csproj | 16 +++++----- .../AdvancedSearch.Server.csproj | 10 +++--- README.md | 5 +-- .../EqDemoWinFormsNet6.csproj | 4 +-- Wpf/EqDemoWpfNet6/EqDemoWpfNet6.csproj | 4 +-- 20 files changed, 112 insertions(+), 111 deletions(-) diff --git a/.github/workflows/archive2cdn.yml b/.github/workflows/archive2cdn.yml index 5d016231..255ea69b 100644 --- a/.github/workflows/archive2cdn.yml +++ b/.github/workflows/archive2cdn.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Archive folders run: | diff --git a/AspNetCore/Angular/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj b/AspNetCore/Angular/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj index d95529e9..156b5867 100644 --- a/AspNetCore/Angular/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj +++ b/AspNetCore/Angular/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable enable @@ -22,11 +22,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/AspNetCore/Angular/AdHocReporting/README.md b/AspNetCore/Angular/AdHocReporting/README.md index e1ee50ba..9de9a79c 100644 --- a/AspNetCore/Angular/AdHocReporting/README.md +++ b/AspNetCore/Angular/AdHocReporting/README.md @@ -5,7 +5,7 @@ This samples consists of two projects: -* AdHocReporting.Server.csproj - the backend web-service app that runs on ASP.NET Core 8.0 +* AdHocReporting.Server.csproj - the backend web-service app that runs on ASP.NET Core 9.0 * AdHocReporting.Server.csproj - the client-side Angular 18 application To start the sample you will need to run both of these two projects. diff --git a/AspNetCore/Angular/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj b/AspNetCore/Angular/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj index a2838f4c..58bac1a3 100644 --- a/AspNetCore/Angular/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj +++ b/AspNetCore/Angular/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 disable false ClientApp\ @@ -13,10 +13,10 @@ - - - - + + + + @@ -34,10 +34,10 @@ - + - - + + diff --git a/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Client/EqDemo.BlazorWasm.AdhocReporting.Client.csproj b/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Client/EqDemo.BlazorWasm.AdhocReporting.Client.csproj index 757d9614..0ebfa526 100644 --- a/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Client/EqDemo.BlazorWasm.AdhocReporting.Client.csproj +++ b/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Client/EqDemo.BlazorWasm.AdhocReporting.Client.csproj @@ -1,18 +1,18 @@  - net6.0 + net9.0 EqDemo.Client enable enable - - - - - + + + + + diff --git a/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Server/EqDemo.BlazorWasm.AdhocReporting.Server.csproj b/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Server/EqDemo.BlazorWasm.AdhocReporting.Server.csproj index 79054182..293511f7 100644 --- a/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Server/EqDemo.BlazorWasm.AdhocReporting.Server.csproj +++ b/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Server/EqDemo.BlazorWasm.AdhocReporting.Server.csproj @@ -1,20 +1,20 @@ - net6.0 + net9.0 disable enable EqDemo.BlazorWasm.AdhocReporting.Server EqDemo.Server - - - - - + + + + + - - + + @@ -23,14 +23,14 @@ - - - - - - - - + + + + + + + + diff --git a/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Shared/EqDemo.BlazorWasm.AdhocReporting.Shared.csproj b/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Shared/EqDemo.BlazorWasm.AdhocReporting.Shared.csproj index a5b78ac4..46f7f7db 100644 --- a/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Shared/EqDemo.BlazorWasm.AdhocReporting.Shared.csproj +++ b/AspNetCore/Blazor/AdHocReporting.BlazorWasm/Shared/EqDemo.BlazorWasm.AdhocReporting.Shared.csproj @@ -1,7 +1,7 @@ - net6.0 + net9.0 enable enable diff --git a/AspNetCore/Blazor/AdvancedSearch.BlazorServer/EqDemo.BlazorServer.AdvancedSearch.csproj b/AspNetCore/Blazor/AdvancedSearch.BlazorServer/EqDemo.BlazorServer.AdvancedSearch.csproj index 41ec6ca4..594a4206 100644 --- a/AspNetCore/Blazor/AdvancedSearch.BlazorServer/EqDemo.BlazorServer.AdvancedSearch.csproj +++ b/AspNetCore/Blazor/AdvancedSearch.BlazorServer/EqDemo.BlazorServer.AdvancedSearch.csproj @@ -1,6 +1,6 @@ - net6.0 + net9.0 disable enable EqDemo @@ -8,10 +8,10 @@ - - - - + + + + @@ -28,10 +28,10 @@ - + - - + + diff --git a/AspNetCore/Razor-Mvc/Mvc.DataFiltering/EqDemo.AspNetCoreMvc.DataFiltering.csproj b/AspNetCore/Razor-Mvc/Mvc.DataFiltering/EqDemo.AspNetCoreMvc.DataFiltering.csproj index 05d7e52d..4946ebde 100644 --- a/AspNetCore/Razor-Mvc/Mvc.DataFiltering/EqDemo.AspNetCoreMvc.DataFiltering.csproj +++ b/AspNetCore/Razor-Mvc/Mvc.DataFiltering/EqDemo.AspNetCoreMvc.DataFiltering.csproj @@ -1,14 +1,14 @@ - net8.0 + net9.0 enable EqDemo.AspNetCoreMvc.DataFiltering - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/AspNetCore/Razor-Mvc/Razor.AdHocReporting/EqDemo.AspNetCoreRazor.AdhocReporting.csproj b/AspNetCore/Razor-Mvc/Razor.AdHocReporting/EqDemo.AspNetCoreRazor.AdhocReporting.csproj index 37816822..c93d2364 100644 --- a/AspNetCore/Razor-Mvc/Razor.AdHocReporting/EqDemo.AspNetCoreRazor.AdhocReporting.csproj +++ b/AspNetCore/Razor-Mvc/Razor.AdHocReporting/EqDemo.AspNetCoreRazor.AdhocReporting.csproj @@ -1,20 +1,20 @@ - net8.0 + net9.0 enable EqDemo EqDemo.AspNetCoreRazor.AdhocReporting true - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/AspNetCore/Razor-Mvc/Razor.AdvancedSearch/EqDemo.AspNetCoreRazor.AdvancedSearch.csproj b/AspNetCore/Razor-Mvc/Razor.AdvancedSearch/EqDemo.AspNetCoreRazor.AdvancedSearch.csproj index 673f8da2..5f6de35c 100644 --- a/AspNetCore/Razor-Mvc/Razor.AdvancedSearch/EqDemo.AspNetCoreRazor.AdvancedSearch.csproj +++ b/AspNetCore/Razor-Mvc/Razor.AdvancedSearch/EqDemo.AspNetCoreRazor.AdvancedSearch.csproj @@ -1,16 +1,16 @@ - net8.0 + net9.0 EqDemo.AspNetCoreRazor.AdvancedSearch true True - - - - - + + + + + diff --git a/AspNetCore/Razor-Mvc/Razor.DataFiltering/EqDemo.AspNetCoreRazor.DataFiltering.csproj b/AspNetCore/Razor-Mvc/Razor.DataFiltering/EqDemo.AspNetCoreRazor.DataFiltering.csproj index 1ce96d7b..69b93a3a 100644 --- a/AspNetCore/Razor-Mvc/Razor.DataFiltering/EqDemo.AspNetCoreRazor.DataFiltering.csproj +++ b/AspNetCore/Razor-Mvc/Razor.DataFiltering/EqDemo.AspNetCoreRazor.DataFiltering.csproj @@ -1,13 +1,13 @@ - net8.0 + net9.0 enable EqDemo.AspNetCoreRazor.DataFiltering - - - + + + diff --git a/AspNetCore/Razor-Mvc/RazorTypeScript.AdHocReporting/EqDemo.AspNetCoreRazorTypeScript.AdhocReporting.csproj b/AspNetCore/Razor-Mvc/RazorTypeScript.AdHocReporting/EqDemo.AspNetCoreRazorTypeScript.AdhocReporting.csproj index d44fa776..8d65edd7 100644 --- a/AspNetCore/Razor-Mvc/RazorTypeScript.AdHocReporting/EqDemo.AspNetCoreRazorTypeScript.AdhocReporting.csproj +++ b/AspNetCore/Razor-Mvc/RazorTypeScript.AdHocReporting/EqDemo.AspNetCoreRazorTypeScript.AdhocReporting.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable EqDemo EqDemo.AspNetCoreRazor.AdhocReporting @@ -10,12 +10,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/AspNetCore/React/AdvancedSearch/EqDemo.AspNetCoreReact.AdvancedSearch.csproj b/AspNetCore/React/AdvancedSearch/EqDemo.AspNetCoreReact.AdvancedSearch.csproj index 40bb9e61..baedbea7 100644 --- a/AspNetCore/React/AdvancedSearch/EqDemo.AspNetCoreReact.AdvancedSearch.csproj +++ b/AspNetCore/React/AdvancedSearch/EqDemo.AspNetCoreReact.AdvancedSearch.csproj @@ -1,6 +1,6 @@ - net6.0 + net9.0 true Latest false @@ -10,11 +10,11 @@ true - - - - - + + + + + @@ -33,8 +33,8 @@ - - + + diff --git a/AspNetCore/Stencil/AdvancedSearch/EqDemo.AspNetCoreStencil.AdvancedSearch.csproj b/AspNetCore/Stencil/AdvancedSearch/EqDemo.AspNetCoreStencil.AdvancedSearch.csproj index 8ea48d12..c54326a4 100644 --- a/AspNetCore/Stencil/AdvancedSearch/EqDemo.AspNetCoreStencil.AdvancedSearch.csproj +++ b/AspNetCore/Stencil/AdvancedSearch/EqDemo.AspNetCoreStencil.AdvancedSearch.csproj @@ -1,6 +1,6 @@ - net6.0 + net9.0 true Latest false @@ -10,15 +10,15 @@ true - - - - - - + + + + + + - - + + diff --git a/AspNetCore/Vue2/AdvancedSearch/EqDemo.AspNetCoreVue2.AdvancedSearch.csproj b/AspNetCore/Vue2/AdvancedSearch/EqDemo.AspNetCoreVue2.AdvancedSearch.csproj index b84cd155..7257766c 100644 --- a/AspNetCore/Vue2/AdvancedSearch/EqDemo.AspNetCoreVue2.AdvancedSearch.csproj +++ b/AspNetCore/Vue2/AdvancedSearch/EqDemo.AspNetCoreVue2.AdvancedSearch.csproj @@ -1,6 +1,6 @@ - net6.0 + net9.0 3.0 ClientApp\ $(DefaultItemExcludes);$(SpaRoot)node_modules\** @@ -10,16 +10,16 @@ - - - - - + + + + + - - + + diff --git a/AspNetCore/Vue3/AdvancedSearch.Server/AdvancedSearch.Server.csproj b/AspNetCore/Vue3/AdvancedSearch.Server/AdvancedSearch.Server.csproj index 4bd2b439..31975636 100644 --- a/AspNetCore/Vue3/AdvancedSearch.Server/AdvancedSearch.Server.csproj +++ b/AspNetCore/Vue3/AdvancedSearch.Server/AdvancedSearch.Server.csproj @@ -1,6 +1,6 @@ - net6.0 + net9.0 enable enable ..\AdvancedSearch.Client @@ -14,16 +14,16 @@ - 6.*-* + 9.0.16 - - - + + + diff --git a/README.md b/README.md index 48076fa7..2924e4d3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # EasyQuery ASP.NET Core Samples -This repository contains several ASP.NET Core 2.x and 3.0 projects which demonstrate how to use [EasyQuery library](https://korzh.com/easyquery) in different web-application scenarios. +This repository contains several ASP.NET Core projects which demonstrate how to use [EasyQuery library](https://korzh.com/easyquery) in different web-application scenarios. ## EasyQuery packages @@ -19,7 +19,8 @@ This repository contains several ASP.NET Core 2.x and 3.0 projects which demonst To run these samples you will need: -* [.NET Core 2.0](https://www.microsoft.com/net/core) +* [.NET 9.0 SDK](https://dotnet.microsoft.com/download/dotnet/9.0) (for ASP.NET Core, WPF, and WinForms projects) +* [.NET Framework 4.x](https://dotnet.microsoft.com/download/dotnet-framework) (for ASP.NET 4 projects only) * [SQL Server Express LocalDB](https://www.microsoft.com/en-us/sql-server/sql-server-editions-express) (it's installed automatically with Visual Studio) * Node.js (to run Angular, Vue or React projects) * Visual Studio 2017 or higher (optional) diff --git a/WinForms/EqDemoWinFormsNet6/EqDemoWinFormsNet6.csproj b/WinForms/EqDemoWinFormsNet6/EqDemoWinFormsNet6.csproj index 1a3e03d9..6fc9adad 100644 --- a/WinForms/EqDemoWinFormsNet6/EqDemoWinFormsNet6.csproj +++ b/WinForms/EqDemoWinFormsNet6/EqDemoWinFormsNet6.csproj @@ -1,7 +1,7 @@ WinExe - net6.0-windows + net9.0-windows true EqDemo @@ -27,7 +27,7 @@ - + diff --git a/Wpf/EqDemoWpfNet6/EqDemoWpfNet6.csproj b/Wpf/EqDemoWpfNet6/EqDemoWpfNet6.csproj index a33b5046..9c158164 100644 --- a/Wpf/EqDemoWpfNet6/EqDemoWpfNet6.csproj +++ b/Wpf/EqDemoWpfNet6/EqDemoWpfNet6.csproj @@ -1,7 +1,7 @@ WinExe - net6.0-windows + net9.0-windows true EqDemo @@ -26,7 +26,7 @@ - +