huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove usage of TaskCache

This commit is contained in:
Pranav K 2017-06-08 11:21:35 -07:00
parent 2eb9bf887b
commit 32406953c4
11 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
View File

@ -16,7 +16,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/UserStoreCore.cs
View File

@ -9,7 +9,6 @@ using System.Security.Claims;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{ {
@ -64,7 +63,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
/// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns> /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
public Task SaveChanges(CancellationToken cancellationToken) public Task SaveChanges(CancellationToken cancellationToken)
{ {
return AutoSaveChanges ? Context.SaveChangesAsync(cancellationToken) : TaskCache.CompletedTask; return AutoSaveChanges ? Context.SaveChangesAsync(cancellationToken) : Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -633,7 +632,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
public override Task AddUserTokenAsync(TUserToken token) public override Task AddUserTokenAsync(TUserToken token)
{ {
UserTokens.Add(token); UserTokens.Add(token);
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -644,7 +643,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
public override Task RemoveUserTokenAsync(TUserToken token) public override Task RemoveUserTokenAsync(TUserToken token)
{ {
UserTokens.Remove(token); UserTokens.Remove(token);
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
} }
} }

1
src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
View File

@ -21,7 +21,6 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="xunit" Version="$(XunitVersion)" /> <PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>

1
src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
View File

@ -17,7 +17,6 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="xunit" Version="$(XunitVersion)" /> <PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>

1
src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj
View File

@ -14,7 +14,6 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
src/Microsoft.AspNetCore.Identity/SignInManager.cs
View File

@ -9,7 +9,6 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -766,7 +765,7 @@ namespace Microsoft.AspNetCore.Identity
{ {
return UserManager.ResetAccessFailedCountAsync(user); return UserManager.ResetAccessFailedCountAsync(user);
} }
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
internal class TwoFactorAuthenticationInfo internal class TwoFactorAuthenticationInfo

1
src/Microsoft.Extensions.Identity.Core/Microsoft.Extensions.Identity.Core.csproj
View File

@ -13,7 +13,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="System.ComponentModel.Annotations" Version="$(CoreFxVersion)" /> <PackageReference Include="System.ComponentModel.Annotations" Version="$(CoreFxVersion)" />
</ItemGroup> </ItemGroup>

1
src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj
View File

@ -12,7 +12,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="System.ComponentModel.Annotations" Version="$(CoreFxVersion)" /> <PackageReference Include="System.ComponentModel.Annotations" Version="$(CoreFxVersion)" />
</ItemGroup> </ItemGroup>

5
src/Microsoft.Extensions.Identity.Stores/RoleStoreBaseV1.cs
View File

@ -8,7 +8,6 @@ using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNetCore.Identity namespace Microsoft.AspNetCore.Identity
{ {
@ -122,7 +121,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(role)); throw new ArgumentNullException(nameof(role));
} }
role.Name = roleName; role.Name = roleName;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -202,7 +201,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(role)); throw new ArgumentNullException(nameof(role));
} }
role.NormalizedName = normalizedName; role.NormalizedName = normalizedName;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>

27
src/Microsoft.Extensions.Identity.Stores/UserStoreBaseV1.cs
View File

@ -8,7 +8,6 @@ using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNetCore.Identity namespace Microsoft.AspNetCore.Identity
{ {
@ -181,7 +180,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.UserName = userName; user.UserName = userName;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -217,7 +216,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.NormalizedUserName = normalizedName; user.NormalizedUserName = normalizedName;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -316,7 +315,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.PasswordHash = passwordHash; user.PasswordHash = passwordHash;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -587,7 +586,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.EmailConfirmed = confirmed; user.EmailConfirmed = confirmed;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -606,7 +605,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.Email = email; user.Email = email;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -661,7 +660,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.NormalizedEmail = normalizedEmail; user.NormalizedEmail = normalizedEmail;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -711,7 +710,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.LockoutEnd = lockoutEnd; user.LockoutEnd = lockoutEnd;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -748,7 +747,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.AccessFailedCount = 0; user.AccessFailedCount = 0;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -803,7 +802,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.LockoutEnabled = enabled; user.LockoutEnabled = enabled;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -822,7 +821,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.PhoneNumber = phoneNumber; user.PhoneNumber = phoneNumber;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -878,7 +877,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.PhoneNumberConfirmed = confirmed; user.PhoneNumberConfirmed = confirmed;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -901,7 +900,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(stamp)); throw new ArgumentNullException(nameof(stamp));
} }
user.SecurityStamp = stamp; user.SecurityStamp = stamp;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -938,7 +937,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.TwoFactorEnabled = enabled; user.TwoFactorEnabled = enabled;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>

7
src/Microsoft.Extensions.Identity.Stores/UserStoreBaseV2.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNetCore.Identity namespace Microsoft.AspNetCore.Identity
{ {
@ -53,7 +52,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.LastPasswordChangeDate = changeDate; user.LastPasswordChangeDate = changeDate;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -90,7 +89,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.CreateDate = creationDate; user.CreateDate = creationDate;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>
@ -127,7 +126,7 @@ namespace Microsoft.AspNetCore.Identity
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
} }
user.LastSignInDate = lastSignIn; user.LastSignInDate = lastSignIn;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
/// <summary> /// <summary>