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 @@ - net8.0 + net10.0 enable enable @@ -15,6 +15,10 @@ + + @@ -31,7 +35,5 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - \ 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 @@ - net8.0 + net10.0 disable false ClientApp\ @@ -13,8 +13,12 @@ - - + + + + @@ -37,8 +41,6 @@ - - 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 @@ - - - - - - - + + + + + + + + - - - - + + 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.