Udate from netcoreapp2.0 to netcoreapp2.1

faddiv · faddiv · commit d228efd5e546 · 2020-06-09T20:33:55.000+02:00
diff --git a/samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj b/samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/FluentAssertions.AspNetCore.Mvc.Sample/FluentAssertions.AspNetCore.Mvc.Sample.csproj b/samples/FluentAssertions.AspNetCore.Mvc.Sample/FluentAssertions.AspNetCore.Mvc.Sample.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
diff --git a/samples/FluentAssertions.AspNetCore.Mvc.Sample/Startup.cs b/samples/FluentAssertions.AspNetCore.Mvc.Sample/Startup.cs
@@ -44,15 +44,15 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
                 app.UseBrowserLink();
 #endif
             }
             else
             {
                 app.UseExceptionHandler("/Home/Error");
             }
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
             loggerFactory.AddConsole(Configuration.GetSection("Logging"));
             loggerFactory.AddDebug();
 #endif
diff --git a/src/FluentAssertions.AspNetCore.Mvc/FluentAssertions.AspNetCore.Mvc.csproj b/src/FluentAssertions.AspNetCore.Mvc/FluentAssertions.AspNetCore.Mvc.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Fluent Assertions extensions for ASP.NET Core MVC.</Description>
@@ -7,7 +7,7 @@
      <Title>Fluent Assertions for ASP.NET Core MVC</Title>
      <VersionPrefix>2.4.0</VersionPrefix>
      <Authors>Casey Burns;Kevin Kuszyk</Authors>
-     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+     <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
      <AssemblyName>FluentAssertions.AspNetCore.Mvc</AssemblyName>
      <PackageId>FluentAssertions.AspNetCore.Mvc</PackageId>
      <PackageTags>TDD;TDD;Fluent;Mvc;AspNetMvc;aspnetcore;aspnetcoremvc</PackageTags>
@@ -30,8 +30,8 @@
      <PackageReference Include="FluentAssertions" Version="5.0.0" />
    </ItemGroup>
 
-   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
+   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.1'">
+     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
    </ItemGroup>
  
    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/ChallengeResultAssertions_Tests.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/ChallengeResultAssertions_Tests.cs
@@ -30,53 +30,7 @@ public void WithAuthenticationProperties_GivenUnexpected_ShouldFail()
             var actualAuthenticationProperties = new AuthenticationProperties();
             var expectedAuthenticationProperties = new AuthenticationProperties();
             ActionResult result = new ChallengeResult(actualAuthenticationProperties);
-#if NETCOREAPP3_0
-            var failureMessage = @"Expected ChallengeResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-}.";
-#else
-            var failureMessage = @"Expected ChallengeResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-}.";
-#endif
+            var failureMessage = FailureMessageHelper.AuthenticationPropertiesExpectations(result);
 
             Action a = () => result.Should().BeChallengeResult().WithAuthenticationProperties(expectedAuthenticationProperties, Reason, ReasonArgs);
 
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/FluentAssertions.AspNetCore.Mvc.Tests.csproj b/tests/FluentAssertions.AspNetCore.Mvc.Tests/FluentAssertions.AspNetCore.Mvc.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/ForbidResultAssertions_Tests.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/ForbidResultAssertions_Tests.cs
@@ -30,53 +30,7 @@ public void WithAuthenticationProperties_GivenUnexpected_ShouldFail()
             var actualAuthenticationProperties = new AuthenticationProperties();
             var expectedAuthenticationProperties = new AuthenticationProperties();
             ActionResult result = new ForbidResult(actualAuthenticationProperties);
-#if NETCOREAPP3_0
-            var failureMessage = @"Expected ForbidResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-}.";
-#else
-            var failureMessage = @"Expected ForbidResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-}.";
-#endif
+            var failureMessage = FailureMessageHelper.AuthenticationPropertiesExpectations(result);
 
             Action a = () => result.Should().BeForbidResult().WithAuthenticationProperties(expectedAuthenticationProperties, Reason, ReasonArgs);
 
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/Helpers/FailureMessageHelper.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/Helpers/FailureMessageHelper.cs
@@ -107,5 +107,33 @@ internal static string ExpectedContextContainValueAtKeyButKeyNotFound(string con
                 ? new DateTimeOffset?(result)
                 : new DateTimeOffset?();
         }
+
+        public static string AuthenticationPropertiesExpectations(object containingObject)
+        {
+            var failureMessage = @"Expected " + containingObject.GetType().Name + @".AuthenticationProperties to be 
+
+Microsoft.AspNetCore.Authentication.AuthenticationProperties
+{
+   AllowRefresh = <null>
+   ExpiresUtc = <null>
+   IsPersistent = False
+   IssuedUtc = <null>
+   Items = {empty}
+   Parameters = {empty}
+   RedirectUri = <null>
+} because it is 10 but found 
+
+Microsoft.AspNetCore.Authentication.AuthenticationProperties
+{
+   AllowRefresh = <null>
+   ExpiresUtc = <null>
+   IsPersistent = False
+   IssuedUtc = <null>
+   Items = {empty}
+   Parameters = {empty}
+   RedirectUri = <null>
+}.";
+            return failureMessage;
+        }
     }
 }
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/SignInResultAssertions_Tests.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/SignInResultAssertions_Tests.cs
@@ -33,53 +33,7 @@ public void WithAuthenticationProperties_GivenUnexpected_ShouldFail()
             var actualAuthenticationProperties = new AuthenticationProperties();
             var expectedAuthenticationProperties = new AuthenticationProperties();
             ActionResult result = new SignInResult(TestAuthenticationScheme, TestClaimsPrincipal, actualAuthenticationProperties);
-#if NETCOREAPP3_0
-            var failureMessage = @"Expected SignInResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-}.";
-#else
-            var failureMessage = @"Expected SignInResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-}.";
-#endif
+            var failureMessage = FailureMessageHelper.AuthenticationPropertiesExpectations(result);
 
             Action a = () => result.Should().BeSignInResult().WithAuthenticationProperties(expectedAuthenticationProperties, Reason, ReasonArgs);
 
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/SignOutResultAssertions_Tests.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/SignOutResultAssertions_Tests.cs
@@ -30,53 +30,7 @@ public void WithAuthenticationProperties_GivenUnexpected_ShouldFail()
             var actualAuthenticationProperties = new AuthenticationProperties();
             var expectedAuthenticationProperties = new AuthenticationProperties();
             ActionResult result = new SignOutResult(TestAuthenticationSchemes, actualAuthenticationProperties);
-#if NETCOREAPP3_0
-            var failureMessage = @"Expected SignOutResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
-}.";
-#else
-            var failureMessage = @"Expected SignOutResult.AuthenticationProperties to be 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-} because it is 10 but found 
-
-Microsoft.AspNetCore.Authentication.AuthenticationProperties
-{
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   RedirectUri = <null>
-}.";
-#endif
+            var failureMessage = FailureMessageHelper.AuthenticationPropertiesExpectations(result);
 
             Action a = () => result.Should().BeSignOutResult().WithAuthenticationProperties(expectedAuthenticationProperties, Reason, ReasonArgs);
 

Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,15 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF`
`44`	`44`	`if (env.IsDevelopment())`
`45`	`45`	`{`
`46`	`46`	`app.UseDeveloperExceptionPage();`
`47`		`-#if NETCOREAPP2_0`
	`47`	`+#if NETCOREAPP2_1`
`48`	`48`	`app.UseBrowserLink();`
`49`	`49`	`#endif`
`50`	`50`	`}`
`51`	`51`	`else`
`52`	`52`	`{`
`53`	`53`	`app.UseExceptionHandler("/Home/Error");`
`54`	`54`	`}`
`55`		`-#if NETCOREAPP2_0`
	`55`	`+#if NETCOREAPP2_1`
`56`	`56`	`loggerFactory.AddConsole(Configuration.GetSection("Logging"));`
`57`	`57`	`loggerFactory.AddDebug();`
`58`	`58`	`#endif`