From 915b1f453000dfa28dd777c2e913c3b0d3301f68 Mon Sep 17 00:00:00 2001
From: Dennis Doomen <dennis.doomen@avivasolutions.nl>
Date: Tue, 20 Nov 2018 11:12:51 +0100
Subject: [PATCH] Reverted changes to AssertionScope to ensure binary
 compatibility

---
 .../Execution/AssertionScope.cs               | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Src/FluentAssertions/Execution/AssertionScope.cs b/Src/FluentAssertions/Execution/AssertionScope.cs
index d4e04c22d6..d4477f4d69 100644
--- a/Src/FluentAssertions/Execution/AssertionScope.cs
+++ b/Src/FluentAssertions/Execution/AssertionScope.cs
@@ -78,7 +78,7 @@ public static AssertionScope Current
             private set => current = value;
         }
 
-        public IAssertionScope UsingLineBreaks
+        public AssertionScope UsingLineBreaks
         {
             get
             {
@@ -92,7 +92,7 @@ public bool Succeeded
             get => succeeded.HasValue && succeeded.Value;
         }
 
-        public IAssertionScope BecauseOf(string because, params object[] becauseArgs)
+        public AssertionScope BecauseOf(string because, params object[] becauseArgs)
         {
             reason = () =>
             {
@@ -125,7 +125,7 @@ public IAssertionScope BecauseOf(string because, params object[] becauseArgs)
         /// </remarks>
         ///  <param name="message">The format string that represents the failure message.</param>
         /// <param name="args">Optional arguments to any numbered placeholders.</param>
-        public IAssertionScope WithExpectation(string message, params object[] args)
+        public AssertionScope WithExpectation(string message, params object[] args)
         {
             var localReason = reason;
             expectation = () =>
@@ -152,7 +152,7 @@ public GivenSelector<T> Given<T>(Func<T> selector)
             return new GivenSelector<T>(selector, !succeeded.HasValue || succeeded.Value, this);
         }
 
-        public IAssertionScope ForCondition(bool condition)
+        public AssertionScope ForCondition(bool condition)
         {
             succeeded = condition;
 
@@ -266,10 +266,24 @@ public void Dispose()
             }
         }
 
-        public IAssertionScope WithDefaultIdentifier(string identifier)
+        public AssertionScope WithDefaultIdentifier(string identifier)
         {
             fallbackIdentifier = identifier;
             return this;
         }
+
+        #region Explicit Implementation to support the interface
+
+        IAssertionScope IAssertionScope.ForCondition(bool condition) => ForCondition(condition);
+
+        IAssertionScope IAssertionScope.BecauseOf(string because, params object[] becauseArgs) => BecauseOf(because, becauseArgs);
+
+        IAssertionScope IAssertionScope.WithExpectation(string message, params object[] args) => WithExpectation(message, args);
+
+        IAssertionScope IAssertionScope.WithDefaultIdentifier(string identifier) => WithDefaultIdentifier(identifier);
+
+        IAssertionScope IAssertionScope.UsingLineBreaks => UsingLineBreaks;
+
+        #endregion
     }
 }