diff --git a/build/dependencies.props b/build/dependencies.props
index 8d59fdcabb..56f9589086 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -8,7 +8,7 @@
4.7.1
$(BundledNETStandardPackageVersion)
3.0.1
- 15.0.0
- 2.2.0
+ 15.3.0-*
+ 2.3.0-beta2-*
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj b/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
index f8882b28f8..5ef91eac75 100644
--- a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
+++ b/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
@@ -24,8 +24,4 @@
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentitySpecificationTestBase.cs b/src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentitySpecificationTestBase.cs
index 7463d17883..aa87c90804 100644
--- a/src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentitySpecificationTestBase.cs
+++ b/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));
}
///
diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
index 59b3c74785..adbc73fcee 100644
--- a/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
+++ b/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
@@ -20,8 +20,4 @@
-
-
-
-
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
index d5c8341ee0..fdf5da4553 100644
--- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
+++ b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
@@ -27,8 +27,4 @@
-
-
-
-
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
index 678dc72599..b371dd4096 100644
--- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
+++ b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
@@ -33,8 +33,4 @@
-
-
-
-
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs
index f5d3cfab18..34a824d62e 100644
--- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs
+++ b/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(_fixture.ConnectionString);
@@ -429,4 +424,4 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
}
public class ApplicationUser : IdentityUser { }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
index 9fd150bc7c..c6a7ae3697 100644
--- a/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
+++ b/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
@@ -26,8 +26,4 @@
-
-
-
-
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
index 9e98f2ed76..70308d5eb3 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
+++ b/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
@@ -16,7 +16,4 @@
-
-
-
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeIssuerTest.cs b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeIssuerTest.cs
index 1570baea36..9266246c35 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeIssuerTest.cs
+++ b/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(context.AuthorizationCode.Token);
Assert.NotNull(result);
- Assert.Equal(null, result.Nonce);
+ Assert.Null(result.Nonce);
}
[Fact]
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizeIntegrationTest.cs b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizeIntegrationTest.cs
index 246d13bc1b..d33c9ebf65 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizeIntegrationTest.cs
+++ b/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));
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
index f9a1b145e1..c75b4e29d0 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
+++ b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
@@ -18,7 +18,4 @@
-
-
-
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
index 1c76a3048b..1de00529a6 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
+++ b/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
@@ -19,7 +19,4 @@
-
-
-
diff --git a/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
index 831bfad3f0..514b898425 100644
--- a/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
+++ b/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
@@ -27,8 +27,4 @@
-
-
-
-