From a435b21391a0d48205ef08e8fc7902652fde75ff Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:21:23 +0300
Subject: [PATCH 1/4] bump

---
 net/Directory.Packages.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props
index 770f6cd0..df347b93 100644
--- a/net/Directory.Packages.props
+++ b/net/Directory.Packages.props
@@ -17,9 +17,9 @@
     <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.3" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.assert" Version="2.4.2" />
-    <PackageVersion Include="xunit.core" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.assert" Version="2.9.2" />
+    <PackageVersion Include="xunit.core" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>

From f6eb7547173d2f50100b8bf06d24788c376841d3 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:21:34 +0300
Subject: [PATCH 2/4] xUnit2013

---
 .../DataSourceLoaderTests.cs                           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs b/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs
index 4c9f2b8b..0196a1b5 100644
--- a/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs
+++ b/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs
@@ -270,7 +270,7 @@ public void Load_Select(bool remoteSelect) {
 
             var item = DataSourceLoader.Load(data, loadOptions).data.Cast<IDictionary<string, object>>().First();
 
-            Assert.Equal(1, item.Keys.Count);
+            Assert.Single(item.Keys);
             Assert.Equal(2, item["f2"]);
         }
 
@@ -357,8 +357,8 @@ public void Load_SelectNested(bool remoteSelect) {
 
             Assert.Equal(3, item.Keys.Count);
             Assert.Equal(2, address.Keys.Count);
-            Assert.Equal(1, addressStreet.Keys.Count);
-            Assert.Equal(1, contacts.Keys.Count);
+            Assert.Single(addressStreet.Keys);
+            Assert.Single(contacts.Keys);
 
             Assert.Equal(data[0].Name, item["Name"]);
             Assert.Equal(data[0].Address.City, address["City"]);
@@ -381,7 +381,7 @@ public void Load_SelectWithConflict(bool remoteSelect) {
             );
 
             var item = result.data.Cast<IDictionary<string, object>>().First();
-            Assert.Equal(1, item.Keys.Count);
+            Assert.Single(item.Keys);
             Assert.True(item.ContainsKey("Item1"));
         }
 
@@ -441,7 +441,7 @@ IDictionary<string, object> Load(string[] preSelect, string[] select) {
                 select: new[] { "b", "c" }
             );
 
-            Assert.Equal(1, item.Keys.Count);
+            Assert.Single(item.Keys);
             Assert.True(item.ContainsKey("b"));
         }
 

From 0226ef1aa4ed536ed0657a87546dd64efc99b0a1 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:22:07 +0300
Subject: [PATCH 3/4] xUnit2031

---
 net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs b/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs
index c0a8281a..86cbd108 100644
--- a/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs
+++ b/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs
@@ -616,7 +616,7 @@ public void T844633_TotalsWoPaging() {
 
             DataSourceLoader.Load(source, loadOptions);
 
-            Assert.Single(loadOptions.ExpressionLog.Where(line => line.Contains("GroupBy")));
+            Assert.Single(loadOptions.ExpressionLog, line => line.Contains("GroupBy"));
         }
     }
 

From b94a2e84b39de987db4cedeeaaf88d6deca12fd5 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Sat, 26 Oct 2024 14:00:38 +0300
Subject: [PATCH 4/4] xUnit1042

---
 net/DevExtreme.AspNet.Data.Tests/IsSummaryQueryTests.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/DevExtreme.AspNet.Data.Tests/IsSummaryQueryTests.cs b/net/DevExtreme.AspNet.Data.Tests/IsSummaryQueryTests.cs
index 862136d9..7001c5d1 100644
--- a/net/DevExtreme.AspNet.Data.Tests/IsSummaryQueryTests.cs
+++ b/net/DevExtreme.AspNet.Data.Tests/IsSummaryQueryTests.cs
@@ -8,7 +8,9 @@ namespace DevExtreme.AspNet.Data.Tests {
     public class IsSummaryQueryTests {
 
         [Theory]
+#pragma warning disable xUnit1042 // skip until rewrite CombinatorialBool to TheoryData / use any ready dep
         [MemberData(nameof(CombinatorialBool), 4)]
+#pragma warning restore xUnit1042
         public void Case(bool remoteGrouping, bool requireTotalCount, bool hasGroups, bool hasSummary) {
             var loadOptions = new SampleLoadOptions {
                 IsSummaryQuery = true,