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

Updating EntitySet/EntityContext to DbSet/DbContext

This commit is contained in:
ajcvickers 2014-04-24 17:25:33 -07:00
parent 9704cbc5ab
commit ab1af578dd
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Identity.Entity
public IdentityContext(IServiceProvider serviceProvider) : base(serviceProvider) { } public IdentityContext(IServiceProvider serviceProvider) : base(serviceProvider) { }
} }
public class IdentityContext<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim> : EntityContext public class IdentityContext<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim> : DbContext
where TUser : EntityUser<TKey, TUserLogin, TUserRole, TUserClaim> where TUser : EntityUser<TKey, TUserLogin, TUserRole, TUserClaim>
where TRole : EntityRole<TKey, TUserRole> /*, TUserRole*/ where TRole : EntityRole<TKey, TUserRole> /*, TUserRole*/
where TUserLogin : IdentityUserLogin<TKey> where TUserLogin : IdentityUserLogin<TKey>
@ -23,8 +23,8 @@ namespace Microsoft.AspNet.Identity.Entity
where TKey : IEquatable<TKey> where TKey : IEquatable<TKey>
{ {
public EntitySet<TUser> Users { get; set; } public DbSet<TUser> Users { get; set; }
public EntitySet<TRole> Roles { get; set; } public DbSet<TRole> Roles { get; set; }
public IdentityContext(IServiceProvider serviceProvider) public IdentityContext(IServiceProvider serviceProvider)
: base(serviceProvider) { } : base(serviceProvider) { }

4
src/Microsoft.AspNet.Identity.Entity/RoleStore.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Identity.Entity
{ {
private bool _disposed; private bool _disposed;
public RoleStore(EntityContext context) public RoleStore(DbContext context)
{ {
if (context == null) if (context == null)
{ {
@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Identity.Entity
AutoSaveChanges = true; AutoSaveChanges = true;
} }
public EntityContext Context { get; private set; } public DbContext Context { get; private set; }
/// <summary> /// <summary>
/// If true will call SaveChanges after CreateAsync/UpdateAsync/DeleteAsync /// If true will call SaveChanges after CreateAsync/UpdateAsync/DeleteAsync

8
src/Microsoft.AspNet.Identity.Entity/UserStore.cs
View File

@ -13,12 +13,12 @@ namespace Microsoft.AspNet.Identity.Entity
public class UserStore : public class UserStore :
UserStore<EntityUser> UserStore<EntityUser>
{ {
public UserStore(EntityContext context) : base(context) { } public UserStore(DbContext context) : base(context) { }
} }
public class UserStore<TUser> : UserStore<TUser, EntityRole, string, IdentityUserLogin, IdentityUserRole, IdentityUserClaim> where TUser:EntityUser public class UserStore<TUser> : UserStore<TUser, EntityRole, string, IdentityUserLogin, IdentityUserRole, IdentityUserClaim> where TUser:EntityUser
{ {
public UserStore(EntityContext context) : base(context) { } public UserStore(DbContext context) : base(context) { }
} }
public class UserStore<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim> : public class UserStore<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim> :
@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Identity.Entity
{ {
private bool _disposed; private bool _disposed;
public UserStore(EntityContext context) public UserStore(DbContext context)
{ {
if (context == null) if (context == null)
{ {
@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Identity.Entity
AutoSaveChanges = true; AutoSaveChanges = true;
} }
public EntityContext Context { get; private set; } public DbContext Context { get; private set; }
/// <summary> /// <summary>
/// If true will call SaveChanges after CreateAsync/UpdateAsync/DeleteAsync /// If true will call SaveChanges after CreateAsync/UpdateAsync/DeleteAsync

6
test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
View File

@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
{ {
public static class TestIdentityFactory public static class TestIdentityFactory
{ {
public static EntityContext CreateContext() public static DbContext CreateContext()
{ {
var serviceProvider = new ServiceCollection() var serviceProvider = new ServiceCollection()
.AddEntityFramework(s => s.AddInMemoryStore()) .AddEntityFramework(s => s.AddInMemoryStore())
@ -79,7 +79,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
} }
public static UserManager<EntityUser> CreateManager(EntityContext context) public static UserManager<EntityUser> CreateManager(DbContext context)
{ {
var manager = new UserManager<EntityUser>(new UserStore(context)) var manager = new UserManager<EntityUser>(new UserStore(context))
{ {
@ -94,7 +94,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
return CreateManager(CreateContext()); return CreateManager(CreateContext());
} }
public static RoleManager<EntityRole> CreateRoleManager(EntityContext context) public static RoleManager<EntityRole> CreateRoleManager(DbContext context)
{ {
return new RoleManager<EntityRole>(new RoleStore<EntityRole, string>(context)); return new RoleManager<EntityRole>(new RoleStore<EntityRole, string>(context));
} }

4
test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
View File

@ -203,9 +203,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
} }
} }
private class SimpleContext : EntityContext private class SimpleContext : DbContext
{ {
public EntitySet<Artist> Artists { get; set; } public DbSet<Artist> Artists { get; set; }
protected override void OnConfiguring(EntityConfigurationBuilder builder) protected override void OnConfiguring(EntityConfigurationBuilder builder)
{ {