Upgrade test framework versions and fix test issues

build/dependencies.props

@@ -8,7 +8,7 @@
     <MoqVersion>4.7.1</MoqVersion>
     <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
     <OwinSecurityVersion>3.0.1</OwinSecurityVersion>
-    <TestSdkVersion>15.0.0</TestSdkVersion>
+    <TestSdkVersion>15.3.0-*</TestSdkVersion>
-    <XunitVersion>2.2.0</XunitVersion>
+    <XunitVersion>2.3.0-beta2-*</XunitVersion>
   </PropertyGroup>
 </Project>

src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj

@@ -24,8 +24,4 @@
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>

src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentitySpecificationTestBase.cs

@@ -2037,9 +2037,9 @@ namespace Microsoft.AspNetCore.Identity.Test
             var user = CreateTestUser(phoneNumber: "123-456-7890");
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
             var stamp = await manager.GetSecurityStampAsync(user);
-            Assert.Equal(await manager.GetPhoneNumberAsync(user), "123-456-7890");
+            Assert.Equal("123-456-7890", await manager.GetPhoneNumberAsync(user));
             IdentityResultAssert.IsSuccess(await manager.SetPhoneNumberAsync(user, "111-111-1111"));
-            Assert.Equal(await manager.GetPhoneNumberAsync(user), "111-111-1111");
+            Assert.Equal("111-111-1111", await manager.GetPhoneNumberAsync(user));
             Assert.NotEqual(stamp, await manager.GetSecurityStampAsync(user));
         }
 
@@ -2062,7 +2062,7 @@ namespace Microsoft.AspNetCore.Identity.Test
             var token1 = await manager.GenerateChangePhoneNumberTokenAsync(user, "111-111-1111");
             IdentityResultAssert.IsSuccess(await manager.ChangePhoneNumberAsync(user, "111-111-1111", token1));
             Assert.True(await manager.IsPhoneNumberConfirmedAsync(user));
-            Assert.Equal(await manager.GetPhoneNumberAsync(user), "111-111-1111");
+            Assert.Equal("111-111-1111", await manager.GetPhoneNumberAsync(user));
             Assert.NotEqual(stamp, await manager.GetSecurityStampAsync(user));
         }
 
@@ -2086,7 +2086,7 @@ namespace Microsoft.AspNetCore.Identity.Test
                 "Invalid token.");
             IdentityResultAssert.VerifyLogMessage(manager.Logger, $"VerifyChangePhoneNumberTokenAsync() failed for user {await manager.GetUserIdAsync(user)}.");
             Assert.False(await manager.IsPhoneNumberConfirmedAsync(user));
-            Assert.Equal(await manager.GetPhoneNumberAsync(user), "123-456-7890");
+            Assert.Equal("123-456-7890", await manager.GetPhoneNumberAsync(user));
             Assert.Equal(stamp, await manager.GetSecurityStampAsync(user));
         }
 
@@ -2110,7 +2110,7 @@ namespace Microsoft.AspNetCore.Identity.Test
             IdentityResultAssert.IsFailure(await manager.ChangePhoneNumberAsync(user, "bogus", token1),
                 "Invalid token.");
             Assert.False(await manager.IsPhoneNumberConfirmedAsync(user));
-            Assert.Equal(await manager.GetPhoneNumberAsync(user), "123-456-7890");
+            Assert.Equal("123-456-7890", await manager.GetPhoneNumberAsync(user));
             Assert.Equal(stamp, await manager.GetSecurityStampAsync(user));
         }
 
@@ -2221,7 +2221,7 @@ namespace Microsoft.AspNetCore.Identity.Test
             Assert.NotEqual(stamp, await manager.GetSecurityStampAsync(user));
             IdentityResultAssert.IsFailure(await manager.ChangeEmailAsync(user, newEmail, token1));
             Assert.False(await manager.IsEmailConfirmedAsync(user));
-            Assert.Equal(await manager.GetEmailAsync(user), "another@email.com");
+            Assert.Equal("another@email.com", await manager.GetEmailAsync(user));
         }
 
         /// <summary>

src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj

@@ -20,8 +20,4 @@
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj

@@ -27,8 +27,4 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj

@@ -33,8 +33,4 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs

@@ -64,11 +64,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
             return CreateContext();
         }
 
-        public void EnsureDatabase()
-        {
-            CreateContext();
-        }
-
         public ApplicationDbContext CreateAppContext()
         {
             var db = DbUtil.Create<ApplicationDbContext>(_fixture.ConnectionString);
@@ -429,4 +424,4 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
     }
 
     public class ApplicationUser : IdentityUser { }
-}
+}

test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj

@@ -26,8 +26,4 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj

@@ -16,7 +16,4 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>

test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeIssuerTest.cs

@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Identity.Service
             Assert.NotNull(context.AuthorizationCode);
             var result = Assert.IsType<AuthorizationCode>(context.AuthorizationCode.Token);
             Assert.NotNull(result);
-            Assert.Equal(null, result.Nonce);
+            Assert.Null(result.Nonce);
         }
 
         [Fact]

test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizeIntegrationTest.cs

@@ -19,6 +19,7 @@ using Microsoft.AspNetCore.Identity.Service.Serialization;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.Net.Http.Headers;
 using Moq;
@@ -59,7 +60,7 @@ namespace Microsoft.AspNetCore.Identity.Service
 
             // Assert
             Assert.Equal(StatusCodes.Status302Found, httpContext.Response.StatusCode);
-            Assert.NotNull(httpContext.Response.Headers[HeaderNames.Location]);
+            Assert.False(StringValues.IsNullOrEmpty(httpContext.Response.Headers[HeaderNames.Location]));
             var uri = new Uri(httpContext.Response.Headers[HeaderNames.Location]);
 
             Assert.False(string.IsNullOrEmpty(uri.Query));
@@ -100,7 +101,7 @@ namespace Microsoft.AspNetCore.Identity.Service
 
             // Assert
             Assert.Equal(StatusCodes.Status302Found, httpContext.Response.StatusCode);
-            Assert.NotNull(httpContext.Response.Headers[HeaderNames.Location]);
+            Assert.False(StringValues.IsNullOrEmpty(httpContext.Response.Headers[HeaderNames.Location]));
             var uri = new Uri(httpContext.Response.Headers[HeaderNames.Location]);
 
             Assert.False(string.IsNullOrEmpty(uri.Fragment));

test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj

@@ -18,7 +18,4 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>

test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj

@@ -19,7 +19,4 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>

test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj

@@ -27,8 +27,4 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>