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>().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>().First(); - Assert.Equal(1, item.Keys.Count); + Assert.Single(item.Keys); Assert.True(item.ContainsKey("Item1")); } @@ -441,7 +441,7 @@ IDictionary Load(string[] preSelect, string[] select) { select: new[] { "b", "c" } ); - Assert.Equal(1, item.Keys.Count); + Assert.Single(item.Keys); Assert.True(item.ContainsKey("b")); } 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, 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")); } } 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 @@ - - - - + + + +