Fixed all the compilation errors left

Most of the errors were simple fix that could be made using simply conditional compilation flags.

Author: Gimly

src/FluentAssertions.AspNetCore.Mvc/PartialViewResultAssertions.cs

@@ -1,6 +1,5 @@
 using System;
 using FluentAssertions.Execution;
-using FluentAssertions.Mvc;
 using FluentAssertions.Primitives;
 using Microsoft.AspNetCore.Mvc;
 

src/FluentAssertions.Mvc.Shared/ActionResultAssertions.cs

@@ -1,7 +1,11 @@
 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

src/FluentAssertions.Mvc.Shared/AssertionsExtensions.cs

@@ -1,8 +1,13 @@
 using FluentAssertions;
 using System;
+#if NETSTANDARD1_6
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+#else
 using System.Web.Mvc;
-using FluentAssertions.Mvc;
 using System.Web.Routing;
+#endif
+using FluentAssertions.Mvc;
 using System.Diagnostics;
 
 namespace FluentAssertions.Mvc

src/FluentAssertions.Mvc.Shared/ContentResultAssertions.cs

@@ -4,7 +4,11 @@
 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
 {
@@ -36,7 +40,11 @@ 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));
 
@@ -59,13 +67,19 @@ 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));
 
             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>
@@ -88,5 +102,6 @@ public ContentResultAssertions WithContentEncoding(Encoding expectedEncoding, st
 
             return this;
         }
+#endif
     }
 }

src/FluentAssertions.Mvc.Shared/FailureMessages.Designer.cs

@@ -2,7 +2,11 @@
 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;
 
@@ -34,7 +38,11 @@ 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);
 

src/FluentAssertions.Mvc.Shared/RedirectResultAssertions.cs

@@ -4,7 +4,11 @@
 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
@@ -57,7 +61,11 @@ public RedirectToRouteAssertions WithRouteName(string expectedRouteName, string
         {
             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);
 
             return this;

src/FluentAssertions.Mvc.Shared/RedirectToRouteAssertions.cs

@@ -2,7 +2,11 @@
 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 FluentAssertions.Execution;
 using FluentAssertions.Primitives;