From e241f849ee769dc4470a7d77c629a3b69ded0a5e Mon Sep 17 00:00:00 2001
From: korzh <sergiy@korzh.com>
Date: Mon, 9 Nov 2026 00:19:17 +0200
Subject: [PATCH] Retarget the samples to .NET 10

- TargetFramework net6.0/net8.0 -> net10.0 (net10.0-windows for WinForms/WPF)
- ASP.NET Core, EF Core and Microsoft.Extensions packages -> 10.0.14;
  per-project VersionOverride attributes removed so the central versions apply
- Pin Microsoft.Data.SqlClient 6.1.8: EF Core 10 resolves 6.1.7, whose
  System.Security.Cryptography.Pkcs 9.0.11 is vulnerable (NU1902/NU1903)
- Drop System.Net.Http and System.Text.RegularExpressions references,
  which are part of the framework on net10.0 (NU1510)
- READMEs: .NET 10 in the framework tables and SDK links
---
 .../AdHocReporting.Server.csproj              |  8 ++++---
 AdHocReporting/README.md                      |  2 +-
 .../EqDemo.Angular.AdvancedSearch.csproj      | 12 ++++++-----
 AdvancedSearch/README.md                      |  4 ++--
 Directory.Packages.props                      | 21 +++++++++----------
 README.md                                     |  4 ++--
 6 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj b/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj
index b4c4eae..f815506 100644
--- a/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj
+++ b/AdHocReporting/AdHocReporting.Server/AdHocReporting.Server.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -15,6 +15,10 @@
     <PackageReference Include="Korzh.DbUtils.Import" />
     <PackageReference Include="Korzh.DbUtils.Sqlite" />
     <PackageReference Include="Korzh.DbUtils.SqlServer" />
+    <!-- Transitive pin: EF Core 10.0.x resolves Microsoft.Data.SqlClient 6.1.7, whose
+         System.Security.Cryptography.Pkcs 9.0.11 is vulnerable (NU1902/NU1903). Can be dropped once
+         EF Core depends on Microsoft.Data.SqlClient 6.1.8 or later. -->
+    <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Korzh.EasyQuery.AspNetCore" />
     <PackageReference Include="Korzh.EasyQuery.DataExport" />
     <PackageReference Include="Korzh.EasyQuery.EntityFrameworkCore.Identity" />
@@ -31,7 +35,5 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Data.SqlClient" />
-    <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Text.RegularExpressions" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/AdHocReporting/README.md b/AdHocReporting/README.md
index e1ee50b..c5c8d05 100644
--- a/AdHocReporting/README.md
+++ b/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 10.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/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj b/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj
index fa128f0..18d4918 100644
--- a/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj
+++ b/AdvancedSearch/EqDemo.Angular.AdvancedSearch.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>disable</Nullable>
     <IsPackable>false</IsPackable>
     <SpaRoot>ClientApp\</SpaRoot>
@@ -13,8 +13,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Korzh.EasyQuery.SqLiteGate" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="8.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <!-- Transitive pin: EF Core 10.0.x resolves Microsoft.Data.SqlClient 6.1.7, whose
+         System.Security.Cryptography.Pkcs 9.0.11 is vulnerable (NU1902/NU1903). Can be dropped once
+         EF Core depends on Microsoft.Data.SqlClient 6.1.8 or later. -->
+    <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Microsoft.AspNetCore.SpaProxy" />
   </ItemGroup>
   <ItemGroup>
@@ -37,8 +41,6 @@
     <PackageReference Include="System.Data.SqlClient" />
     <PackageReference Include="System.Drawing.Common" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
-    <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Text.RegularExpressions" />
   </ItemGroup>
   <ItemGroup>
     <!-- Don't publish the SPA source files, but do show them in the project files list -->
diff --git a/AdvancedSearch/README.md b/AdvancedSearch/README.md
index 9442130..5a0bc4b 100644
--- a/AdvancedSearch/README.md
+++ b/AdvancedSearch/README.md
@@ -8,7 +8,7 @@ Part of [EasyQuery samples for ASP.NET Core + Angular](../README.md).
 
 | | |
 |---|---|
-| Host | ASP.NET Core 8 |
+| Host | ASP.NET Core 10 |
 | UI | Angular 12 |
 | Language | C#, TypeScript |
 | EasyQuery | 7.5.0 — `Korzh.EasyQuery.SqLiteGate`, `Korzh.EasyQuery.AspNetCore`, `Korzh.EasyQuery.EntityFrameworkCore.Relational`, `Korzh.EasyQuery.DataExport`, `Korzh.EasyQuery.SqlServerGate` |
@@ -18,7 +18,7 @@ Part of [EasyQuery samples for ASP.NET Core + Angular](../README.md).
 
 ## Prerequisites
 
-* [.NET 8 SDK](https://dotnet.microsoft.com/download)
+* [.NET 10 SDK](https://dotnet.microsoft.com/download)
 * [Node.js](https://nodejs.org/) (LTS)
 * Visual Studio 2022 17.2 or later, VS Code or any other editor (optional)
 * SQL Server Express LocalDB (installed with Visual Studio)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index aa57385..bdba74f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -18,17 +18,16 @@
     <PackageVersion Include="Korzh.DbUtils.Import" Version="1.4.3" />
     <PackageVersion Include="Korzh.DbUtils.Sqlite" Version="1.4.3" />
     <PackageVersion Include="Korzh.DbUtils.SqlServer" Version="1.4.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.14" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.14" />
+    <PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="10.0.14" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.14" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.8" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.14" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.14" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.23.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageVersion Include="System.Drawing.Common" Version="8.0.4" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
-    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="System.Drawing.Common" Version="10.0.14" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.23.0" />
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
index 96140ed..dd2e465 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ to .NET applications. The samples in this repository show it on ASP.NET Core + A
 
 | Sample | Scenario | Stack |
 |---|---|---|
-| [Advanced search](AdvancedSearch) | Advanced search | ASP.NET Core 8 · Angular 12 · C#, TypeScript |
-| [Ad-hoc reporting](AdHocReporting) | Ad-hoc reporting | ASP.NET Core 8 · Angular 18 · C#, TypeScript |
+| [Advanced search](AdvancedSearch) | Advanced search | ASP.NET Core 10 · Angular 12 · C#, TypeScript |
+| [Ad-hoc reporting](AdHocReporting) | Ad-hoc reporting | ASP.NET Core 10 · Angular 18 · C#, TypeScript |
 
 * **Advanced search.** A full-page query builder: users pick the columns, combine any conditions they need, run the query and work with the result — sorting, paging and export.
 * **Ad-hoc reporting.** A basic ad-hoc reporting tool: users keep a list of reports, set up the columns and conditions of each one, and see the result as a table (with grouping and totals) or a chart.