From 8c0fda64cc38398111698a32b57e8bf3f2b7eb34 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 12:03:59 +0800 Subject: [PATCH 01/19] update to net10 --- .../DevExtreme.AspNet.Data.Tests.Common.csproj | 2 +- .../DevExtreme.AspNet.Data.Tests.EFCore8.csproj | 2 +- .../DevExtreme.AspNet.Data.Tests.NH.csproj | 2 +- .../DevExtreme.AspNet.Data.Tests.Xpo.csproj | 2 +- .../DevExtreme.AspNet.Data.Tests.csproj | 2 +- net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj index 0d5d5f38c..b18ca2f1c 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj @@ -1,7 +1,7 @@ - net462;net8.0 + net462;net10.0 DevExtreme.AspNet.Data.Tests False diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj index 4b1fc46a9..e1738026b 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 EFCORE8 diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj index 02e51a3ff..3da022456 100644 --- a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj b/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj index 132e9ef1a..e27c5cdbc 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 diff --git a/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj b/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj index 7e02081c2..e9b31bf6d 100644 --- a/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj +++ b/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 NEWTONSOFT_TESTS diff --git a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj index 0544f0333..a14789eba 100644 --- a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj +++ b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj @@ -14,7 +14,7 @@ DevExtreme.AspNet.Data 99.0 - net462;net8.0 + net462;net10.0 full bin\Debug\$(TargetFramework)\DevExtreme.AspNet.Data.xml 1591 From 781828548dec2467abb7ac49477c087e8a9f76f3 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 12:50:37 +0800 Subject: [PATCH 02/19] try to fix nhibernate issue --- .../DevExtreme.AspNet.Data.Tests.NH.csproj | 1 + net/Directory.Packages.props | 1 + 2 files changed, 2 insertions(+) diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj index 3da022456..765e72332 100644 --- a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj @@ -6,6 +6,7 @@ + diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index a26a0f464..248001331 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -8,6 +8,7 @@ + From c76b7427a85ba5c66cf908b39cb76146c081cb7e Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 14:59:11 +0800 Subject: [PATCH 03/19] return 8.0 --- net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj index a14789eba..d33f2b67c 100644 --- a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj +++ b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj @@ -14,7 +14,7 @@ DevExtreme.AspNet.Data 99.0 - net462;net10.0 + net462;net8.0;net10.0 full bin\Debug\$(TargetFramework)\DevExtreme.AspNet.Data.xml 1591 From 79d2d6d4796bd4ce92c9cca8dae7f6afca16fa9f Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 16:44:16 +0800 Subject: [PATCH 04/19] update ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ab7db54b..57503eb14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: dotnet-quality: ga dotnet-version: | 3.1 - 8.0 + 10.0 - uses: actions/checkout@v4 From c78289f1d5780ffef0d09f71ddce111c5afd5ba1 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 16:44:36 +0800 Subject: [PATCH 05/19] add 11.0 output --- net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj index d33f2b67c..dada11acd 100644 --- a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj +++ b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj @@ -14,7 +14,7 @@ DevExtreme.AspNet.Data 99.0 - net462;net8.0;net10.0 + net462;net8.0;net10.0;net11.0 full bin\Debug\$(TargetFramework)\DevExtreme.AspNet.Data.xml 1591 From 7c98c3af2922d4de2c81669477c0340f1f850a47 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 16:54:48 +0800 Subject: [PATCH 06/19] fix docfx --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57503eb14..1a217679e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: dotnet-quality: ga dotnet-version: | 3.1 - 10.0 + 11.0 - uses: actions/checkout@v4 From c0c482fad9a3e29d91a010a686de334bea34fa80 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 16:56:15 +0800 Subject: [PATCH 07/19] update version --- .../DevExtreme.AspNet.Data.Tests.EFCore9.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj index c36999422..2d990acf6 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 EFCORE9 From 3195f6ef4885b709538497ff5b76dfdfa2ce83c5 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 17:00:27 +0800 Subject: [PATCH 08/19] remove EFCore projects < 10 --- ...evExtreme.AspNet.Data.Tests.EFCore8.csproj | 28 ------------------- ...evExtreme.AspNet.Data.Tests.EFCore9.csproj | 28 ------------------- net/DevExtreme.AspNet.Data.sln | 12 -------- 3 files changed, 68 deletions(-) delete mode 100644 net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj delete mode 100644 net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj deleted file mode 100644 index e1738026b..000000000 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - net10.0 - EFCORE8 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj deleted file mode 100644 index 2d990acf6..000000000 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - net10.0 - EFCORE9 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/DevExtreme.AspNet.Data.sln b/net/DevExtreme.AspNet.Data.sln index 449900749..a9f6afaf1 100644 --- a/net/DevExtreme.AspNet.Data.sln +++ b/net/DevExtreme.AspNet.Data.sln @@ -29,10 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.L2S", "DevExtreme.AspNet.Data.Tests.L2S\DevExtreme.AspNet.Data.Tests.L2S.csproj", "{190E01CD-78FC-4578-ACBF-7D6C4DC57C18}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore8", "DevExtreme.AspNet.Data.Tests.EFCore8\DevExtreme.AspNet.Data.Tests.EFCore8.csproj", "{CD8E0248-F0E8-4CE4-94C0-F8905E37D97F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore9", "DevExtreme.AspNet.Data.Tests.EFCore9\DevExtreme.AspNet.Data.Tests.EFCore9.csproj", "{613530E9-013E-4FBD-BC3C-17F28B0C78EA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.EFCore10", "DevExtreme.AspNet.Data.Tests.EFCore10\DevExtreme.AspNet.Data.Tests.EFCore10.csproj", "{E67890C3-C447-394F-F0F9-679CB217BF88}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.EFCore11", "DevExtreme.AspNet.Data.Tests.EFCore11\DevExtreme.AspNet.Data.Tests.EFCore11.csproj", "{D93F0842-675B-2C69-F615-837D1C66157F}" @@ -79,14 +75,6 @@ Global {190E01CD-78FC-4578-ACBF-7D6C4DC57C18}.Debug|Any CPU.Build.0 = Debug|Any CPU {190E01CD-78FC-4578-ACBF-7D6C4DC57C18}.Release|Any CPU.ActiveCfg = Release|Any CPU {190E01CD-78FC-4578-ACBF-7D6C4DC57C18}.Release|Any CPU.Build.0 = Release|Any CPU - {CD8E0248-F0E8-4CE4-94C0-F8905E37D97F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD8E0248-F0E8-4CE4-94C0-F8905E37D97F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD8E0248-F0E8-4CE4-94C0-F8905E37D97F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD8E0248-F0E8-4CE4-94C0-F8905E37D97F}.Release|Any CPU.Build.0 = Release|Any CPU - {613530E9-013E-4FBD-BC3C-17F28B0C78EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {613530E9-013E-4FBD-BC3C-17F28B0C78EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {613530E9-013E-4FBD-BC3C-17F28B0C78EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {613530E9-013E-4FBD-BC3C-17F28B0C78EA}.Release|Any CPU.Build.0 = Release|Any CPU {E67890C3-C447-394F-F0F9-679CB217BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E67890C3-C447-394F-F0F9-679CB217BF88}.Debug|Any CPU.Build.0 = Debug|Any CPU {E67890C3-C447-394F-F0F9-679CB217BF88}.Release|Any CPU.ActiveCfg = Release|Any CPU From cadfe67c98ce110455a6dc25620ddcd5bcdb962b Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 17:12:36 +0800 Subject: [PATCH 09/19] fix docfx --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a217679e..28655712f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: dotnet-quality: ga dotnet-version: | 3.1 - 11.0 + 10.0 - uses: actions/checkout@v4 @@ -137,6 +137,11 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-dotnet@v4 + with: + dotnet-quality: ga + dotnet-version: 11.0.x + - run: dotnet build net/DevExtreme.AspNet.Data - run: net\docfx\build.cmd From 9c194201bcf4f1339dc58d0af3e9f86efb9e4cb4 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 17:24:07 +0800 Subject: [PATCH 10/19] remove unnecessary version override --- .../DevExtreme.AspNet.Data.Tests.EFCore10.csproj | 2 +- net/Directory.Packages.props | 2 +- net/Sample/Sample.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore10/DevExtreme.AspNet.Data.Tests.EFCore10.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore10/DevExtreme.AspNet.Data.Tests.EFCore10.csproj index 763fed06c..e76cd11ac 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore10/DevExtreme.AspNet.Data.Tests.EFCore10.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EFCore10/DevExtreme.AspNet.Data.Tests.EFCore10.csproj @@ -8,7 +8,7 @@ - + diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index 248001331..9af2823c1 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -11,7 +11,7 @@ - + diff --git a/net/Sample/Sample.csproj b/net/Sample/Sample.csproj index 26c25a884..02863215a 100644 --- a/net/Sample/Sample.csproj +++ b/net/Sample/Sample.csproj @@ -8,7 +8,7 @@ - + From 34091997b1908689df2177da1511de82ad029108 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 17:41:32 +0800 Subject: [PATCH 11/19] update target for 11.0 --- .../DevExtreme.AspNet.Data.Tests.Common.csproj | 2 +- net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj index b18ca2f1c..956e79334 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj @@ -1,7 +1,7 @@ - net462;net10.0 + net472;net10.0 DevExtreme.AspNet.Data.Tests False diff --git a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj index dada11acd..8ed807ad2 100644 --- a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj +++ b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj @@ -14,13 +14,13 @@ DevExtreme.AspNet.Data 99.0 - net462;net8.0;net10.0;net11.0 + net472;net10.0; full bin\Debug\$(TargetFramework)\DevExtreme.AspNet.Data.xml 1591 - + From 9dfad61c0281e8a5a223ce9de118900c6cec2b22 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 19:40:30 +0800 Subject: [PATCH 12/19] revert set .net for docfx --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28655712f..57503eb14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,11 +137,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v4 - with: - dotnet-quality: ga - dotnet-version: 11.0.x - - run: dotnet build net/DevExtreme.AspNet.Data - run: net\docfx\build.cmd From ee4e8e545a9f44344f8fd7a9cbf5d29100917b25 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Wed, 29 Jul 2026 20:11:05 +0800 Subject: [PATCH 13/19] update dependency version --- net/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index 9af2823c1..effae2aaf 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -13,7 +13,7 @@ - + From 9a7e1c74dfc94afc9d1c4b3f702e8e1bd2edf254 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Thu, 30 Jul 2026 13:16:26 +0800 Subject: [PATCH 14/19] update dependency --- net/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index effae2aaf..e389b9541 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -10,7 +10,7 @@ - + From 8bde8e4b82fd7e88190107001a68e9162d1a23a4 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Thu, 30 Jul 2026 13:56:40 +0800 Subject: [PATCH 15/19] try to remove deprecated package --- .../DevExtreme.AspNet.Data.Tests.Common.csproj | 2 +- .../SqlServerTestDbHelper.cs | 2 +- .../DevExtreme.AspNet.Data.Tests.EF6.csproj | 3 ++- net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs | 3 +++ net/Directory.Packages.props | 4 +++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj index 956e79334..5c176f655 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj @@ -12,7 +12,7 @@ - + diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs b/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs index 39f9cae41..d41648ae9 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs +++ b/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs @@ -1,4 +1,4 @@ -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Reflection; diff --git a/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj b/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj index 17fecd7ff..f8cad8d2d 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj @@ -9,7 +9,8 @@ - + + diff --git a/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs b/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs index 9da18c210..977c9b7c1 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs +++ b/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs @@ -1,12 +1,15 @@ using System; using System.Collections.Generic; using System.Data.Entity; +using System.Data.Entity.Infrastructure; +using System.Data.Entity.SqlServer; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DevExtreme.AspNet.Data.Tests.EF6 { + [DbConfigurationType(typeof(MicrosoftSqlDbConfiguration))] class TestDbContext : DbContext { static TestDbContext INSTANCE; diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index e389b9541..81caf8093 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -6,12 +6,14 @@ - + + + From 96961cc8a9ae68ec0f68c54d89b21872bfde2b1c Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Thu, 30 Jul 2026 14:01:37 +0800 Subject: [PATCH 16/19] Revert "try to remove deprecated package" This reverts commit 8bde8e4b82fd7e88190107001a68e9162d1a23a4. --- .../DevExtreme.AspNet.Data.Tests.Common.csproj | 2 +- .../SqlServerTestDbHelper.cs | 2 +- .../DevExtreme.AspNet.Data.Tests.EF6.csproj | 3 +-- net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs | 3 --- net/Directory.Packages.props | 4 +--- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj index 5c176f655..956e79334 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj @@ -12,7 +12,7 @@ - + diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs b/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs index d41648ae9..39f9cae41 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs +++ b/net/DevExtreme.AspNet.Data.Tests.Common/SqlServerTestDbHelper.cs @@ -1,4 +1,4 @@ -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.IO; using System.Reflection; diff --git a/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj b/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj index f8cad8d2d..17fecd7ff 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj @@ -9,8 +9,7 @@ - - + diff --git a/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs b/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs index 977c9b7c1..9da18c210 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs +++ b/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs @@ -1,15 +1,12 @@ using System; using System.Collections.Generic; using System.Data.Entity; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.SqlServer; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DevExtreme.AspNet.Data.Tests.EF6 { - [DbConfigurationType(typeof(MicrosoftSqlDbConfiguration))] class TestDbContext : DbContext { static TestDbContext INSTANCE; diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index 81caf8093..e389b9541 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -6,14 +6,12 @@ - - + - From 1298912c23a6c9dbddcc01515fb1c08ed5f96680 Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Thu, 30 Jul 2026 14:03:57 +0800 Subject: [PATCH 17/19] update dependencies --- net/Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index e389b9541..522bec25e 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -20,8 +20,8 @@ - - + + From e2703ecfa8e6d0acd870de8cfacf15d38298a95a Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Thu, 30 Jul 2026 14:10:27 +0800 Subject: [PATCH 18/19] try to remove System.Net.Http --- .../DevExtreme.AspNet.Data.Tests.NH.csproj | 1 - net/Directory.Packages.props | 1 - 2 files changed, 2 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj index 765e72332..677e72227 100644 --- a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj @@ -8,7 +8,6 @@ - diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index 522bec25e..0e260456a 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -19,7 +19,6 @@ - From ae55a37058b0f7b9d9dcdf32f106001f1e0d4c3d Mon Sep 17 00:00:00 2001 From: "mikhail.losev" <> Date: Thu, 30 Jul 2026 14:16:13 +0800 Subject: [PATCH 19/19] removed System.Text.RegularExpressions --- .../DevExtreme.AspNet.Data.Tests.NH.csproj | 1 - net/Directory.Packages.props | 1 - 2 files changed, 2 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj index 677e72227..874b6a7c8 100644 --- a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj @@ -8,7 +8,6 @@ - diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props index 0e260456a..5c83a8f17 100644 --- a/net/Directory.Packages.props +++ b/net/Directory.Packages.props @@ -21,7 +21,6 @@ -