fluentassertions · kevinkuszyk · Jun 22, 2018 · Jun 21, 2018
diff --git a/src/FluentAssertions.Mvc.Shared/ActionResultAssertions.cs b/src/FluentAssertions.Mvc.Shared/ActionResultAssertions.cs
@@ -1,11 +1,6 @@
 using FluentAssertions.Primitives;
 using FluentAssertions.Execution;
-using System;
-#if NETSTANDARD1_6
-using Microsoft.AspNetCore.Mvc;
-#else
 using System.Web.Mvc;
-#endif
 using System.Diagnostics;
 
 namespace FluentAssertions.Mvc
@@ -35,13 +30,6 @@ public ActionResultAssertions (ActionResult subject) : base(subject)
 			Subject = subject;
 		}
 
-#if NETSTANDARD1_6
-        public ActionResultAssertions (IActionResult subject): base(subject)
-        {
-            Subject = subject;
-        }
-#endif
-
         /// <summary>
         /// Asserts that the subject is a <see cref="ContentResult"/>.
         /// </summary>

diff --git a/src/FluentAssertions.Mvc.Shared/AssertionsExtensions.cs b/src/FluentAssertions.Mvc.Shared/AssertionsExtensions.cs
@@ -1,13 +1,5 @@
-using FluentAssertions;
-using System;
-#if NETSTANDARD1_6
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-#else
 using System.Web.Mvc;
 using System.Web.Routing;
-#endif
-using FluentAssertions.Mvc;
 using System.Diagnostics;
 
 namespace FluentAssertions.Mvc
@@ -27,17 +19,6 @@ public static ActionResultAssertions Should (this ActionResult actual)
             return new ActionResultAssertions (actual);
         }
 
-#if NETSTANDARD1_6
-        /// <summary>
-        /// Returns an <see cref="ActionResultAssertions"/> object that can be used to assert the
-        /// current <see cref="IActionResult"/>.
-        /// </summary>
-        public static ActionResultAssertions Should (this IActionResult actual)
-        {
-            return new ActionResultAssertions (actual);
-        }
-#endif
-
         /// <summary>
         /// Returns an <see cref="RouteDataAssertions"/> object that can be used to assert the
         /// current <see cref="RouteData"/>.

diff --git a/src/FluentAssertions.Mvc.Shared/ContentResultAssertions.cs b/src/FluentAssertions.Mvc.Shared/ContentResultAssertions.cs
@@ -1,14 +1,8 @@
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-#if NETSTANDARD1_6
-using Microsoft.AspNetCore.Mvc;
-#else
 using System.Web.Mvc;
-#endif
 
 namespace FluentAssertions.Mvc
 {
@@ -40,13 +34,9 @@ public ContentResultAssertions WithContent(string expectedContent, string reason
             string actualContent = (Subject as ContentResult).Content;
 
             Execute.Assertion
-#if NETSTANDARD1_6
-                    .ForCondition(string.Equals(actualContent, expectedContent, StringComparison.OrdinalIgnoreCase))
-#else
-                    .ForCondition(string.Equals(actualContent, expectedContent, StringComparison.InvariantCultureIgnoreCase))
-#endif
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent));
+                .ForCondition(string.Equals(actualContent, expectedContent, StringComparison.InvariantCultureIgnoreCase))
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent));
 
             return this;
         }
@@ -67,19 +57,13 @@ public ContentResultAssertions WithContentType(string expectedContentType, strin
             string actualContentType = (Subject as ContentResult).ContentType;
 
             Execute.Assertion
-#if NETSTANDARD1_6
-                    .ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.OrdinalIgnoreCase))
-#else
-                    .ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.InvariantCultureIgnoreCase))
-#endif
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedContentType, actualContentType));
+                .ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.InvariantCultureIgnoreCase))
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedContentType, actualContentType));
 
             return this;
         }
 
-        // ContentEncoding seems to have vanished from .NetCore... weird.
-#if !NETSTANDARD1_6
         /// <summary>
         /// Asserts that the content encoding is the expected content encoding type.
         /// </summary>
@@ -102,6 +86,5 @@ public ContentResultAssertions WithContentEncoding(Encoding expectedEncoding, st
 
             return this;
         }
-#endif
     }
 }
diff --git a/src/FluentAssertions.Mvc.Shared/FailureMessages.Designer.cs b/src/FluentAssertions.Mvc.Shared/FailureMessages.Designer.cs
diff --git a/src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpContext.cs b/src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpContext.cs
@@ -1,5 +1,4 @@
-#if !NETSTANDARD1_6
-using System;
+using System;
 using System.Web;
 
 namespace FluentAssertions.Mvc.Fakes
@@ -138,4 +137,3 @@ public override void EndOfRequest()
 
 
 }
-#endif
diff --git a/src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpRequest.cs b/src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpRequest.cs
@@ -1,5 +1,4 @@
-#if !NETSTANDARD1_6
-using System.Web;
+using System.Web;
 using System.Collections.Specialized;
 
 namespace FluentAssertions.Mvc.Fakes
@@ -71,4 +70,3 @@ public override NameValueCollection ServerVariables
         }
     }
 }
-#endif
diff --git a/src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpResponse.cs b/src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpResponse.cs
@@ -1,5 +1,4 @@
-#if !NETSTANDARD1_6
-using System.Web;
+using System.Web;
 
 namespace FluentAssertions.Mvc.Fakes
 {
@@ -15,4 +14,3 @@ public override string ApplyAppPathModifier(string virtualPath)
         }
     }
 }
-#endif
diff --git a/src/FluentAssertions.Mvc.Shared/PartialViewResultAssertions.cs b/src/FluentAssertions.Mvc.Shared/PartialViewResultAssertions.cs
@@ -1,11 +1,5 @@
-#if !NETSTANDARD1_6
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Diagnostics;
-using FluentAssertions.Primitives;
 
 namespace FluentAssertions.Mvc
 {
@@ -22,4 +16,3 @@ public class PartialViewResultAssertions : ViewResultBaseAssertions<PartialViewR
         public PartialViewResultAssertions(PartialViewResult viewResult) : base(viewResult) { }
     }
 }
-#endif
diff --git a/src/FluentAssertions.Mvc.Shared/RedirectResultAssertions.cs b/src/FluentAssertions.Mvc.Shared/RedirectResultAssertions.cs
@@ -1,12 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-#if NETSTANDARD1_6
-using Microsoft.AspNetCore.Mvc;
-#else
 using System.Web.Mvc;
-#endif
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
@@ -38,13 +31,9 @@ public RedirectResultAssertions WithUrl(string expectedUrl, string reason = "",
             string actualUrl = (Subject as RedirectResult).Url;
 
             Execute.Assertion
-#if NETSTANDARD1_6
-                    .ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.OrdinalIgnoreCase))
-#else
-                    .ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.InvariantCultureIgnoreCase))
-#endif
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith("Expected RedirectResult.Url to be {0}{reason} but was {1}", expectedUrl, actualUrl);
+                .ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.InvariantCultureIgnoreCase))
+                .BecauseOf(reason, reasonArgs)
+                .FailWith("Expected RedirectResult.Url to be {0}{reason} but was {1}", expectedUrl, actualUrl);
 
             return this;
         }
@@ -65,9 +54,9 @@ public RedirectResultAssertions WithPermanent(bool expectedPermanent, string rea
             bool actualPermanent = (Subject as RedirectResult).Permanent;
 
             Execute.Assertion
-                    .ForCondition(expectedPermanent == actualPermanent)
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith("Expected RedirectResult.Permanent to be {0}{reason} but was {1}", expectedPermanent, actualPermanent);
+                .ForCondition(expectedPermanent == actualPermanent)
+                .BecauseOf(reason, reasonArgs)
+                .FailWith("Expected RedirectResult.Permanent to be {0}{reason} but was {1}", expectedPermanent, actualPermanent);
 
             return this;
         }

diff --git a/src/FluentAssertions.Mvc.Shared/RedirectToRouteAssertions.cs b/src/FluentAssertions.Mvc.Shared/RedirectToRouteAssertions.cs
@@ -1,15 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
-#if NETSTANDARD1_6
-using Microsoft.AspNetCore.Mvc;
-#else
 using System.Web.Mvc;
-#endif
-using FluentAssertions;
 
 namespace FluentAssertions.Mvc
 {
@@ -40,9 +33,9 @@ public RedirectToRouteAssertions(RedirectToRouteResult subject)
         public RedirectToRouteAssertions WithPermanent(bool expectedPermanent, string reason = "", params object[] reasonArgs)
         {
             Execute.Assertion 
-                    .BecauseOf(reason, reasonArgs)
-                    .ForCondition(expectedPermanent == Subject.Permanent)
-                    .FailWith("Expected RedirectToRoute.Permanent to be {0}{reason}, but found {1}", expectedPermanent, Subject.Permanent);
+                .BecauseOf(reason, reasonArgs)
+                .ForCondition(expectedPermanent == Subject.Permanent)
+                .FailWith("Expected RedirectToRoute.Permanent to be {0}{reason}, but found {1}", expectedPermanent, Subject.Permanent);
             return this;
         }
 
@@ -60,13 +53,9 @@ public RedirectToRouteAssertions WithPermanent(bool expectedPermanent, string re
         public RedirectToRouteAssertions WithRouteName(string expectedRouteName, string reason = "", params object[] reasonArgs)
         {
             Execute.Assertion 
-                    .BecauseOf(reason, reasonArgs)
-#if NETSTANDARD1_6
-                    .ForCondition(string.Equals(expectedRouteName, Subject.RouteName, StringComparison.OrdinalIgnoreCase))
-#else
-                    .ForCondition(string.Equals(expectedRouteName, Subject.RouteName, StringComparison.InvariantCultureIgnoreCase))
-#endif
-                    .FailWith("Expected RedirectToRoute.RouteName to be {0}{reason}, but found {1}", expectedRouteName, Subject.RouteName);
+                .BecauseOf(reason, reasonArgs)
+                .ForCondition(string.Equals(expectedRouteName, Subject.RouteName, StringComparison.InvariantCultureIgnoreCase))
+                .FailWith("Expected RedirectToRoute.RouteName to be {0}{reason}, but found {1}", expectedRouteName, Subject.RouteName);
 
             return this;
         }

diff --git a/src/FluentAssertions.Mvc.Shared/RouteCollection_Extensions.cs b/src/FluentAssertions.Mvc.Shared/RouteCollection_Extensions.cs
@@ -1,9 +1,4 @@
-#if !NETSTANDARD1_6
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.Routing;
+using System.Web.Routing;
 using FluentAssertions.Mvc.Fakes;
 using System.Diagnostics;
 
@@ -29,4 +24,3 @@ public static RouteData GetRouteDataForUrl(this RouteCollection routes, string u
         }
     }
 }
-#endif
diff --git a/src/FluentAssertions.Mvc.Shared/RouteDataAssertions.cs b/src/FluentAssertions.Mvc.Shared/RouteDataAssertions.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-#if NETSTANDARD1_6
-using Microsoft.AspNetCore.Routing;
-#else
-using System.Web.Routing;
-#endif
-using FluentAssertions;
+using System.Web.Routing;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 using System.Diagnostics;
@@ -80,16 +71,16 @@ public RouteDataAssertions HaveDataToken(string key, object expectedValue, strin
             var subjectTyped = Subject as RouteData;
 
             Execute.Assertion
-                    .ForCondition(subjectTyped.DataTokens.ContainsKey(key))
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(FailureMessages.RouteData_DataTokens_ContainsKey, key);
+                .ForCondition(subjectTyped.DataTokens.ContainsKey(key))
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(FailureMessages.RouteData_DataTokens_ContainsKey, key);
 
             var actualValue = subjectTyped.DataTokens[key];
 
             Execute.Assertion
-                    .ForCondition(expectedValue.Equals(actualValue))
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(FailureMessages.RouteData_DataTokens_HaveValue, key, expectedValue, actualValue);
+                .ForCondition(expectedValue.Equals(actualValue))
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(FailureMessages.RouteData_DataTokens_HaveValue, key, expectedValue, actualValue);
 
             return this;
         }
@@ -111,16 +102,16 @@ public RouteDataAssertions HaveValue(string key, object expectedValue, string re
             var subjectTyped = Subject as RouteData;
 
             Execute.Assertion
-                    .ForCondition(subjectTyped.Values.ContainsKey(key))
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(FailureMessages.RouteData_Values_ContainsKey, key);
+                .ForCondition(subjectTyped.Values.ContainsKey(key))
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(FailureMessages.RouteData_Values_ContainsKey, key);
 
             var actualValue = subjectTyped.Values[key];
 
             Execute.Assertion
-                    .ForCondition(expectedValue.Equals(actualValue))
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(FailureMessages.RouteData_Values_HaveValue, key, expectedValue, actualValue);
+                .ForCondition(expectedValue.Equals(actualValue))
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(FailureMessages.RouteData_Values_HaveValue, key, expectedValue, actualValue);
 
             return this;
         }

diff --git a/src/FluentAssertions.Mvc.Shared/RouteValueDictionary_Extensions.cs b/src/FluentAssertions.Mvc.Shared/RouteValueDictionary_Extensions.cs
@@ -1,5 +1,4 @@
-#if !NETSTANDARD1_6
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 using FluentAssertions.Mvc.Fakes;
 
@@ -25,4 +24,3 @@ public static string GenerateUrl(this RouteValueDictionary routeValues, RouteCol
         }
     }
 }
-#endif
diff --git a/src/FluentAssertions.Mvc.Shared/ViewResultAssertions.cs b/src/FluentAssertions.Mvc.Shared/ViewResultAssertions.cs
@@ -1,4 +1,3 @@
-#if !NETSTANDARD1_6
 using FluentAssertions.Execution;
 using System;
 using System.Web.Mvc;
@@ -40,4 +39,3 @@ public ViewResultAssertions WithMasterName(string expectedMasterName, string rea
         }
 	}
 }
-#endif
diff --git a/src/FluentAssertions.Mvc.Shared/ViewResultBaseAssertions.cs b/src/FluentAssertions.Mvc.Shared/ViewResultBaseAssertions.cs
@@ -1,8 +1,4 @@
-#if !NETSTANDARD1_6
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 using System.Web.Mvc;
@@ -159,4 +155,3 @@ public ViewResultBaseAssertions<T> WithDefaultViewName(string reason = "", param
         }
     }
 }
-#endif