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

Reacting to changes in EF service registration.

This commit is contained in:
Arthur Vickers 2016-03-10 14:55:58 -08:00
parent d56274040f
commit a4ed79cc5a
14 changed files with 22 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared/Mocks/StartupOpenIdConnectTesting.cs
View File

@ -47,16 +47,12 @@ namespace MusicStore
// Add EF services to the services container // Add EF services to the services container
if (useInMemoryStore) if (useInMemoryStore)
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()); options.UseInMemoryDatabase());
} }
else else
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddSqlServer()
.AddDbContext<MusicStoreContext>(options =>
options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"]));
} }

8
shared/Mocks/StartupSocialTesting.cs
View File

@ -53,16 +53,12 @@ namespace MusicStore
// Add EF services to the services container // Add EF services to the services container
if (useInMemoryStore) if (useInMemoryStore)
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()); options.UseInMemoryDatabase());
} }
else else
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddSqlServer()
.AddDbContext<MusicStoreContext>(options =>
options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"]));
} }

5
src/MusicStore/Models/MusicStoreContext.cs
View File

@ -7,6 +7,11 @@ namespace MusicStore.Models
public class MusicStoreContext : IdentityDbContext<ApplicationUser> public class MusicStoreContext : IdentityDbContext<ApplicationUser>
{ {
public MusicStoreContext(DbContextOptions<MusicStoreContext> options)
: base(options)
{
}
public DbSet<Album> Albums { get; set; } public DbSet<Album> Albums { get; set; }
public DbSet<Artist> Artists { get; set; } public DbSet<Artist> Artists { get; set; }
public DbSet<Order> Orders { get; set; } public DbSet<Order> Orders { get; set; }

8
src/MusicStore/Startup.cs
View File

@ -42,16 +42,12 @@ namespace MusicStore
// Add EF services to the services container // Add EF services to the services container
if (useInMemoryStore) if (useInMemoryStore)
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()); options.UseInMemoryDatabase());
} }
else else
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddSqlServer()
.AddDbContext<MusicStoreContext>(options =>
options.UseSqlServer(Configuration[StoreConfig.ConnectionStringKey.Replace("__",":")])); options.UseSqlServer(Configuration[StoreConfig.ConnectionStringKey.Replace("__",":")]));
} }

4
src/MusicStore/StartupNtlmAuthentication.cs
View File

@ -52,9 +52,7 @@ namespace MusicStore
services.Configure<AppSettings>(Configuration.GetSection("AppSettings")); services.Configure<AppSettings>(Configuration.GetSection("AppSettings"));
// Add EF services to the services container // Add EF services to the services container
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddSqlServer()
.AddDbContext<MusicStoreContext>(options =>
options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"]));
// Add Identity services to the services container // Add Identity services to the services container

8
src/MusicStore/StartupOpenIdConnect.cs
View File

@ -57,16 +57,12 @@ namespace MusicStore
// Add EF services to the services container // Add EF services to the services container
if (useInMemoryStore) if (useInMemoryStore)
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()); options.UseInMemoryDatabase());
} }
else else
{ {
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options =>
.AddSqlServer()
.AddDbContext<MusicStoreContext>(options =>
options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"]));
} }

4
test/MusicStore.Test/CartSummaryComponentTest.cs
View File

@ -21,9 +21,7 @@ namespace MusicStore.Components
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

4
test/MusicStore.Test/CheckoutControllerTest.cs
View File

@ -23,9 +23,7 @@ namespace MusicStore.Controllers
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

4
test/MusicStore.Test/GenreMenuComponentTest.cs
View File

@ -17,9 +17,7 @@ namespace MusicStore.Components
public GenreMenuComponentTest() public GenreMenuComponentTest()
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

4
test/MusicStore.Test/HomeControllerTest.cs
View File

@ -19,9 +19,7 @@ namespace MusicStore.Controllers
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

4
test/MusicStore.Test/ManageControllerTest.cs
View File

@ -24,9 +24,7 @@ namespace MusicStore.Controllers
public ManageControllerTest() public ManageControllerTest()
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
services.AddIdentity<ApplicationUser, IdentityRole>() services.AddIdentity<ApplicationUser, IdentityRole>()
.AddEntityFrameworkStores<MusicStoreContext>(); .AddEntityFrameworkStores<MusicStoreContext>();

4
test/MusicStore.Test/Models/ShoppingCartTest.cs
View File

@ -46,9 +46,7 @@ namespace MusicStore.Test
public ShoppingCartFixture() public ShoppingCartFixture()
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

4
test/MusicStore.Test/ShoppingCartControllerTest.cs
View File

@ -26,9 +26,7 @@ namespace MusicStore.Controllers
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
services.AddMvc(); services.AddMvc();

4
test/MusicStore.Test/StoreControllerTest.cs
View File

@ -19,9 +19,7 @@ namespace MusicStore.Controllers
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
.AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }