diff --git a/.editorconfig b/.editorconfig
index 5432624a1..f4874fecc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -331,6 +331,10 @@ resharper_parentheses_redundancy_style = remove_if_not_clarifies_precedence
dotnet_analyzer_diagnostic.category-roslynator.severity = error
+# Purpose: Remove trailing white-space
+# Reason: It also complains about this when pressing enter to start a new empty line.
+dotnet_diagnostic.RCS1037.severity = none
+
# Remove suffix 'Async' from non-asynchronous method name. Disabled because we like that suffix for now.
dotnet_diagnostic.RCS1047.severity = none
diff --git a/FluentAssertions.sln.DotSettings b/FluentAssertions.sln.DotSettings
index 692c8c68d..b46258db8 100644
--- a/FluentAssertions.sln.DotSettings
+++ b/FluentAssertions.sln.DotSettings
@@ -141,7 +141,7 @@
<Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" />
<Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" />
<Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" />
-
+
OUTLINE
SOLUTION_FOLDER
True
@@ -164,16 +164,16 @@
0
aaa
Arrange-Act-Assert
- [TestMethod]
-public void When_$scenario$_it_should_$behavior$()
-{
- // Arrange
- $END$
-
- // Act
-
-
- // Assert
+ [Fact]
+public void $END$()
+{
+ // Arrange
+
+
+ // Act
+
+
+ // Assert
}
True
True
diff --git a/Src/FluentAssertions/AndConstraint.cs b/Src/FluentAssertions/AndConstraint.cs
index 00d94c841..796336bd3 100644
--- a/Src/FluentAssertions/AndConstraint.cs
+++ b/Src/FluentAssertions/AndConstraint.cs
@@ -3,15 +3,15 @@
namespace FluentAssertions;
[DebuggerNonUserCode]
-public class AndConstraint
+public class AndConstraint
{
- public T And { get; }
+ public TParent And { get; }
///
/// Initializes a new instance of the class.
///
- public AndConstraint(T parentConstraint)
+ public AndConstraint(TParent parent)
{
- And = parentConstraint;
+ And = parent;
}
}