SAVEPOINT

Dennis Doomen · dennisdoomen · commit 9ffc836fef63 · 2023-10-29T11:50:13.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,4 @@
-root = true
+ root = true
 # EditorConfig is awesome: http://EditorConfig.org
 
 # top-most EditorConfig file
@@ -172,7 +172,7 @@ dotnet_diagnostic.RS0030.severity = error
 dotnet_diagnostic.IDE0004.severity = error
 
 # IDE0005: Remove unnecessary usings/imports
-dotnet_diagnostic.IDE0005.severity = suggestion
+dotnet_diagnostic.IDE0005.severity = error
 
 # IDE0051: Remove unused private members (no reads or writes)
 dotnet_diagnostic.IDE0051.severity = error
diff --git a/Build/_build.csproj b/Build/_build.csproj
@@ -23,8 +23,8 @@
     <PackageDownload Include="xunit.runner.console" Version="[2.5.0]" />
     <PackageDownload Include="Node.js.redist" Version="[16.20.0]" />
     <PackageReference Include="LibGit2Sharp" Version="0.27.2" />
-    <PackageReference Include="Nuke.Common" Version="7.0.4" />
-    <PackageReference Include="Nuke.Components" Version="7.0.4" />
+    <PackageReference Include="Nuke.Common" Version="7.0.6" />
+    <PackageReference Include="Nuke.Components" Version="7.0.6" />
     <PackageDownload Include="Yarn.MSBuild" Version="[1.22.19]" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project>
+a<Project>
   <PropertyGroup>
     <LangVersion>11.0</LangVersion>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisLevel>7.0</AnalysisLevel>
     <AnalysisMode>All</AnalysisMode>
     <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
@@ -26,15 +26,15 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.3">
+    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Analyzers" Version="4.3.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.6.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.70">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.103">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Src/FluentAssertions.DataSets/Common/ReadOnlyNonGenericCollectionWrapper.cs b/Src/FluentAssertions.DataSets/Common/ReadOnlyNonGenericCollectionWrapper.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
-using FluentAssertions.Common;
 
 namespace FluentAssertions.DataSets.Common;
 
diff --git a/Src/FluentAssertions.DataSets/DataColumnCollectionAssertionExtensions.cs b/Src/FluentAssertions.DataSets/DataColumnCollectionAssertionExtensions.cs
@@ -2,7 +2,6 @@
 using System.Data;
 using System.Linq;
 using FluentAssertions.Collections;
-using FluentAssertions.Common;
 using FluentAssertions.DataSets.Common;
 using FluentAssertions.Execution;
 
diff --git a/Src/FluentAssertions.DataSets/DataEquivalencyAssertionOptions.cs b/Src/FluentAssertions.DataSets/DataEquivalencyAssertionOptions.cs
@@ -3,7 +3,6 @@
 using System.Data;
 using System.Linq.Expressions;
 using System.Reflection;
-using FluentAssertions.DataSets.Equivalency;
 using FluentAssertions.Equivalency;
 
 namespace FluentAssertions.DataSets;
@@ -127,8 +126,7 @@ private void ExcludeMemberOfSubtypeOfRelatedTypeByGeneratedPredicate<TDeclaringT
 
     private static MemberInfo GetMemberAccessTargetMember(Expression expression)
     {
-        if (expression is UnaryExpression unaryExpression
-            && unaryExpression.NodeType == ExpressionType.Convert)
+        if (expression is UnaryExpression { NodeType: ExpressionType.Convert } unaryExpression)
         {
             // If the expression is a value type, then accessing it will involve an
             // implicit boxing conversion to type object that we need to ignore.
@@ -257,12 +255,7 @@ public bool ShouldExcludeColumn(DataColumn column)
             return true;
         }
 
-        if (excludeColumnNamesByTableName.TryGetValue(column.Table.TableName, out HashSet<string> excludeColumnsForTable)
-            && excludeColumnsForTable.Contains(column.ColumnName))
-        {
-            return true;
-        }
-
-        return false;
+        return excludeColumnNamesByTableName.TryGetValue(column.Table.TableName, out HashSet<string> excludeColumnsForTable)
+            && excludeColumnsForTable.Contains(column.ColumnName);
     }
 }
diff --git a/Src/FluentAssertions.DataSets/DataRowAssertionExtensions.cs b/Src/FluentAssertions.DataSets/DataRowAssertionExtensions.cs
@@ -3,6 +3,7 @@
 using FluentAssertions.DataSets;
 using JetBrains.Annotations;
 
+// ReSharper disable once CheckNamespace
 namespace FluentAssertions;
 
 /// <summary>
diff --git a/Src/FluentAssertions.DataSets/DataRowCollectionAssertionExtensions.cs b/Src/FluentAssertions.DataSets/DataRowCollectionAssertionExtensions.cs
@@ -2,7 +2,6 @@
 using System.Data;
 using System.Linq;
 using FluentAssertions.Collections;
-using FluentAssertions.Common;
 using FluentAssertions.DataSets.Common;
 using FluentAssertions.Execution;
 
diff --git a/Src/FluentAssertions.DataSets/DataTableAssertionExtensions.cs b/Src/FluentAssertions.DataSets/DataTableAssertionExtensions.cs
@@ -1,7 +1,9 @@
 ﻿using System.Data;
 using System.Diagnostics;
+using FluentAssertions.DataSets;
 using JetBrains.Annotations;
 
+// ReSharper disable once CheckNamespace
 namespace FluentAssertions;
 
 /// <summary>
diff --git a/Src/FluentAssertions.DataSets/DataTableAssertions.cs b/Src/FluentAssertions.DataSets/DataTableAssertions.cs
@@ -3,13 +3,12 @@
 using System.Data;
 using System.Diagnostics;
 using System.Linq;
-using FluentAssertions.DataSets;
 using FluentAssertions.DataSets.Common;
 using FluentAssertions.Equivalency;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-namespace FluentAssertions;
+namespace FluentAssertions.DataSets;
 
 /// <summary>
 /// Provides convenient assertion methods on a <see cref="DataTable"/> that can be
diff --git a/Src/FluentAssertions.DataSets/DataTableCollectionAssertionExtensions.cs b/Src/FluentAssertions.DataSets/DataTableCollectionAssertionExtensions.cs
@@ -2,7 +2,6 @@
 using System.Data;
 using System.Linq;
 using FluentAssertions.Collections;
-using FluentAssertions.Common;
 using FluentAssertions.DataSets.Common;
 using FluentAssertions.Execution;
 
diff --git a/Src/FluentAssertions.DataSets/Equivalency/DataColumnEquivalencyStep.cs b/Src/FluentAssertions.DataSets/Equivalency/DataColumnEquivalencyStep.cs
@@ -14,9 +14,8 @@ protected override EquivalencyResult OnHandle(Comparands comparands, IEquivalenc
         IEquivalencyValidator nestedValidator)
     {
         var subject = comparands.Subject as DataColumn;
-        var expectation = comparands.Expectation as DataColumn;
 
-        if (expectation is null)
+        if (comparands.Expectation is not DataColumn expectation)
         {
             if (subject is not null)
             {
diff --git a/Src/FluentAssertions.DataSets/Equivalency/DataRelationEquivalencyStep.cs b/Src/FluentAssertions.DataSets/Equivalency/DataRelationEquivalencyStep.cs
@@ -15,9 +15,8 @@ protected override EquivalencyResult OnHandle(Comparands comparands, IEquivalenc
         IEquivalencyValidator nestedValidator)
     {
         var subject = comparands.Subject as DataRelation;
-        var expectation = comparands.Expectation as DataRelation;
 
-        if (expectation is null)
+        if (comparands.Expectation is not DataRelation expectation)
         {
             if (subject is not null)
             {
diff --git a/Src/FluentAssertions.DataSets/Equivalency/DataRowCollectionEquivalencyStep.cs b/Src/FluentAssertions.DataSets/Equivalency/DataRowCollectionEquivalencyStep.cs
@@ -201,12 +201,7 @@ public bool Equals(CompoundKey other)
                 return false;
             }
 
-            if (values.Length != other.values.Length)
-            {
-                return false;
-            }
-
-            return values.SequenceEqual(other.values);
+            return values.Length == other.values.Length && values.SequenceEqual(other.values);
         }
 
         public override bool Equals(object obj) => Equals(obj as CompoundKey);
diff --git a/Src/FluentAssertions.DataSets/Equivalency/DataRowEquivalencyStep.cs b/Src/FluentAssertions.DataSets/Equivalency/DataRowEquivalencyStep.cs
@@ -16,9 +16,8 @@ protected override EquivalencyResult OnHandle(Comparands comparands, IEquivalenc
         IEquivalencyValidator nestedValidator)
     {
         var subject = comparands.Subject as DataRow;
-        var expectation = comparands.Expectation as DataRow;
 
-        if (expectation is null)
+        if (comparands.Expectation is not DataRow expectation)
         {
             if (subject is not null)
             {
diff --git a/Src/FluentAssertions.DataSets/Equivalency/DataTableEquivalencyStep.cs b/Src/FluentAssertions.DataSets/Equivalency/DataTableEquivalencyStep.cs
@@ -14,9 +14,8 @@ protected override EquivalencyResult OnHandle(Comparands comparands, IEquivalenc
         IEquivalencyValidator nestedValidator)
     {
         var subject = comparands.Subject as DataTable;
-        var expectation = comparands.Expectation as DataTable;
 
-        if (expectation is null)
+        if (comparands.Expectation is not DataTable expectation)
         {
             if (subject is not null)
             {
diff --git a/Src/FluentAssertions.DataSets/EquivalencyAssertionOptionsExtensions.cs b/Src/FluentAssertions.DataSets/EquivalencyAssertionOptionsExtensions.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using FluentAssertions.DataSets.Equivalency;
 using FluentAssertions.Equivalency.Steps;
-using FluentAssertions.Xml;
 
 namespace FluentAssertions.DataSets;
 
diff --git a/Src/FluentAssertions.DataSets/FluentAssertions.DataSets.csproj b/Src/FluentAssertions.DataSets/FluentAssertions.DataSets.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Package info">
-    <Authors>Dennis Doomen;Jonas Nyrup</Authors>
+    <Authors>Dennis Doomen;Jonathan Gilbert</Authors>
     <PackageDescription>
       Extensions to Fluent Assertions for dealing with DataSets and DataTables.
     </PackageDescription>
@@ -59,7 +59,7 @@
       <PackagePath>contentFiles\any\any\</PackagePath>
     </None>
   </ItemGroup>
-  
+
   <!-- Target framework dependent configuration -->
   <Choose>
     <When Condition="'$(TargetFramework)' == 'net6.0'">
diff --git a/Src/FluentAssertions.DataSets/RowMatchMode.cs b/Src/FluentAssertions.DataSets/RowMatchMode.cs
@@ -20,5 +20,5 @@ public enum RowMatchMode
     /// <see cref="DataTable"/> objects with exactly equivalent <see cref="DataTable.PrimaryKey"/>
     /// configuration.
     /// </summary>
-    PrimaryKey,
+    PrimaryKey
 }
diff --git a/Tests/Approval.Tests/ApiApproval.cs b/Tests/Approval.Tests/ApiApproval.cs
@@ -50,7 +50,7 @@ public Task ApproveApi(string frameworkVersion)
     private static string GetSourceDirectory([CallerFilePath] string path = "") => Path.GetDirectoryName(path);
 
     // Copied from https://github.com/VerifyTests/Verify.DiffPlex/blob/master/src/Verify.DiffPlex/VerifyDiffPlex.cs
-    public static Task<CompareResult> OnlyIncludeChanges(string received, string verified, IReadOnlyDictionary<string, object> _)
+    private static Task<CompareResult> OnlyIncludeChanges(string received, string verified, IReadOnlyDictionary<string, object> _)
     {
         var diff = InlineDiffBuilder.Diff(verified, received);
 
diff --git a/Tests/Approval.Tests/Approval.Tests.csproj b/Tests/Approval.Tests/Approval.Tests.csproj
@@ -6,15 +6,15 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="7.0.0-alpha.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.2.1" />
-    <PackageReference Include="Verify.Xunit" Version="20.6.0" />
+    <PackageReference Include="Verify.DiffPlex" Version="2.3.0" />
+    <PackageReference Include="Verify.Xunit" Version="22.1.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions.DataSets/net47.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions.DataSets/net47.verified.txt
@@ -37,21 +37,9 @@ namespace FluentAssertions
     }
     public static class DataTableAssertionExtensions
     {
-        public static FluentAssertions.DataTableAssertions<TDataTable> Should<TDataTable>(this TDataTable actualValue)
+        public static FluentAssertions.DataSets.DataTableAssertions<TDataTable> Should<TDataTable>(this TDataTable actualValue)
             where TDataTable : System.Data.DataTable { }
     }
-    public class DataTableAssertions<TDataTable> : FluentAssertions.Primitives.ReferenceTypeAssertions<System.Data.DataTable, FluentAssertions.DataTableAssertions<TDataTable>>
-        where TDataTable : System.Data.DataTable
-    {
-        public DataTableAssertions(TDataTable dataTable) { }
-        protected override string Identifier { get; }
-        public FluentAssertions.AndConstraint<FluentAssertions.DataTableAssertions<TDataTable>> BeEquivalentTo(System.Data.DataTable expectation, string because = "", params object[] becauseArgs) { }
-        public FluentAssertions.AndConstraint<FluentAssertions.DataTableAssertions<TDataTable>> BeEquivalentTo(System.Data.DataTable expectation, System.Func<FluentAssertions.DataSets.IDataEquivalencyAssertionOptions<System.Data.DataTable>, FluentAssertions.DataSets.IDataEquivalencyAssertionOptions<System.Data.DataTable>> config, string because = "", params object[] becauseArgs) { }
-        public FluentAssertions.AndWhichConstraint<FluentAssertions.DataTableAssertions<TDataTable>, System.Data.DataColumn> HaveColumn(string expectedColumnName, string because = "", params object[] becauseArgs) { }
-        public FluentAssertions.AndConstraint<FluentAssertions.DataTableAssertions<TDataTable>> HaveColumns(params string[] expectedColumnNames) { }
-        public FluentAssertions.AndConstraint<FluentAssertions.DataTableAssertions<TDataTable>> HaveColumns(System.Collections.Generic.IEnumerable<string> expectedColumnNames, string because = "", params object[] becauseArgs) { }
-        public FluentAssertions.AndConstraint<FluentAssertions.DataTableAssertions<TDataTable>> HaveRowCount(int expected, string because = "", params object[] becauseArgs) { }
-    }
     public static class DataTableCollectionAssertionExtensions
     {
         public static FluentAssertions.AndConstraint<FluentAssertions.Collections.GenericCollectionAssertions<System.Data.DataTable>> BeSameAs(this FluentAssertions.Collections.GenericCollectionAssertions<System.Data.DataTable> assertion, System.Data.DataTableCollection expected, string because = "", params object[] becauseArgs) { }
@@ -102,6 +90,18 @@ namespace FluentAssertions.DataSets
         public FluentAssertions.AndConstraint<FluentAssertions.DataSets.DataSetAssertions<TDataSet>> HaveTables(params string[] expectedTableNames) { }
         public FluentAssertions.AndConstraint<FluentAssertions.DataSets.DataSetAssertions<TDataSet>> HaveTables(System.Collections.Generic.IEnumerable<string> expectedTableNames, string because = "", params object[] becauseArgs) { }
     }
+    public class DataTableAssertions<TDataTable> : FluentAssertions.Primitives.ReferenceTypeAssertions<System.Data.DataTable, FluentAssertions.DataSets.DataTableAssertions<TDataTable>>
+        where TDataTable : System.Data.DataTable
+    {
+        public DataTableAssertions(TDataTable dataTable) { }
+        protected override string Identifier { get; }
+        public FluentAssertions.AndConstraint<FluentAssertions.DataSets.DataTableAssertions<TDataTable>> BeEquivalentTo(System.Data.DataTable expectation, string because = "", params object[] becauseArgs) { }
+        public FluentAssertions.AndConstraint<FluentAssertions.DataSets.DataTableAssertions<TDataTable>> BeEquivalentTo(System.Data.DataTable expectation, System.Func<FluentAssertions.DataSets.IDataEquivalencyAssertionOptions<System.Data.DataTable>, FluentAssertions.DataSets.IDataEquivalencyAssertionOptions<System.Data.DataTable>> config, string because = "", params object[] becauseArgs) { }
+        public FluentAssertions.AndWhichConstraint<FluentAssertions.DataSets.DataTableAssertions<TDataTable>, System.Data.DataColumn> HaveColumn(string expectedColumnName, string because = "", params object[] becauseArgs) { }
+        public FluentAssertions.AndConstraint<FluentAssertions.DataSets.DataTableAssertions<TDataTable>> HaveColumns(params string[] expectedColumnNames) { }
+        public FluentAssertions.AndConstraint<FluentAssertions.DataSets.DataTableAssertions<TDataTable>> HaveColumns(System.Collections.Generic.IEnumerable<string> expectedColumnNames, string because = "", params object[] becauseArgs) { }
+        public FluentAssertions.AndConstraint<FluentAssertions.DataSets.DataTableAssertions<TDataTable>> HaveRowCount(int expected, string because = "", params object[] becauseArgs) { }
+    }
     public static class EquivalencyAssertionOptionsExtensions
     {
         public static void AddDataSetSupport(this FluentAssertions.EquivalencyPlan plan) { }
diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions.DataSets/net6.0.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions.DataSets/net6.0.verified.txt
diff --git a/Tests/Benchmarks/Benchmarks.csproj b/Tests/Benchmarks/Benchmarks.csproj
diff --git a/Tests/Benchmarks/LargeDataTableEquivalency.cs b/Tests/Benchmarks/LargeDataTableEquivalency.cs
diff --git a/Tests/FluentAssertions.DataSets.Specs/DataSpecs.cs b/Tests/FluentAssertions.DataSets.Specs/DataSpecs.cs
diff --git a/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj b/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj
diff --git a/nuget.config b/nuget.config

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System.Data;`
`4`	`4`	`using System.Linq.Expressions;`
`5`	`5`	`using System.Reflection;`
`6`		`-using FluentAssertions.DataSets.Equivalency;`
`7`	`6`	`using FluentAssertions.Equivalency;`
`8`	`7`
`9`	`8`	`namespace FluentAssertions.DataSets;`
`@@ -127,8 +126,7 @@ private void ExcludeMemberOfSubtypeOfRelatedTypeByGeneratedPredicate<TDeclaringT`
`127`	`126`
`128`	`127`	`private static MemberInfo GetMemberAccessTargetMember(Expression expression)`
`129`	`128`	`{`
`130`		`- if (expression is UnaryExpression unaryExpression`
`131`		`- && unaryExpression.NodeType == ExpressionType.Convert)`
	`129`	`+ if (expression is UnaryExpression { NodeType: ExpressionType.Convert } unaryExpression)`
`132`	`130`	`{`
`133`	`131`	`// If the expression is a value type, then accessing it will involve an`
`134`	`132`	`// implicit boxing conversion to type object that we need to ignore.`
`@@ -257,12 +255,7 @@ public bool ShouldExcludeColumn(DataColumn column)`
`257`	`255`	`return true;`
`258`	`256`	`}`
`259`	`257`
`260`		`- if (excludeColumnNamesByTableName.TryGetValue(column.Table.TableName, out HashSet<string> excludeColumnsForTable)`
`261`		`- && excludeColumnsForTable.Contains(column.ColumnName))`
`262`		`- {`
`263`		`- return true;`
`264`		`- }`
`265`		`-`
`266`		`- return false;`
	`258`	`+ return excludeColumnNamesByTableName.TryGetValue(column.Table.TableName, out HashSet<string> excludeColumnsForTable)`
	`259`	`+ && excludeColumnsForTable.Contains(column.ColumnName);`
`267`	`260`	`}`
`268`	`261`	`}`