From a4ed79cc5a5d02f74af1e5ea2558f815fb9326cf Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Thu, 10 Mar 2016 14:55:58 -0800 Subject: [PATCH] Reacting to changes in EF service registration. --- shared/Mocks/StartupOpenIdConnectTesting.cs | 8 ++------ shared/Mocks/StartupSocialTesting.cs | 8 ++------ src/MusicStore/Models/MusicStoreContext.cs | 5 +++++ src/MusicStore/Startup.cs | 8 ++------ src/MusicStore/StartupNtlmAuthentication.cs | 4 +--- src/MusicStore/StartupOpenIdConnect.cs | 8 ++------ test/MusicStore.Test/CartSummaryComponentTest.cs | 4 +--- test/MusicStore.Test/CheckoutControllerTest.cs | 4 +--- test/MusicStore.Test/GenreMenuComponentTest.cs | 4 +--- test/MusicStore.Test/HomeControllerTest.cs | 4 +--- test/MusicStore.Test/ManageControllerTest.cs | 4 +--- test/MusicStore.Test/Models/ShoppingCartTest.cs | 4 +--- test/MusicStore.Test/ShoppingCartControllerTest.cs | 4 +--- test/MusicStore.Test/StoreControllerTest.cs | 4 +--- 14 files changed, 22 insertions(+), 51 deletions(-) diff --git a/shared/Mocks/StartupOpenIdConnectTesting.cs b/shared/Mocks/StartupOpenIdConnectTesting.cs index afd3bbd7c2..7bfbbf3d0b 100644 --- a/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -47,16 +47,12 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => + services.AddDbContext(options => options.UseInMemoryDatabase()); } else { - services.AddEntityFramework() - .AddSqlServer() - .AddDbContext(options => + services.AddDbContext(options => options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); } diff --git a/shared/Mocks/StartupSocialTesting.cs b/shared/Mocks/StartupSocialTesting.cs index 36b4bbf974..c37ea2967d 100644 --- a/shared/Mocks/StartupSocialTesting.cs +++ b/shared/Mocks/StartupSocialTesting.cs @@ -53,16 +53,12 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => + services.AddDbContext(options => options.UseInMemoryDatabase()); } else { - services.AddEntityFramework() - .AddSqlServer() - .AddDbContext(options => + services.AddDbContext(options => options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); } diff --git a/src/MusicStore/Models/MusicStoreContext.cs b/src/MusicStore/Models/MusicStoreContext.cs index 7954da93ce..1e9fabe9bd 100644 --- a/src/MusicStore/Models/MusicStoreContext.cs +++ b/src/MusicStore/Models/MusicStoreContext.cs @@ -7,6 +7,11 @@ namespace MusicStore.Models public class MusicStoreContext : IdentityDbContext { + public MusicStoreContext(DbContextOptions options) + : base(options) + { + } + public DbSet Albums { get; set; } public DbSet Artists { get; set; } public DbSet Orders { get; set; } diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index 2c0d11f6c9..921d2b6452 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -42,16 +42,12 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => + services.AddDbContext(options => options.UseInMemoryDatabase()); } else { - services.AddEntityFramework() - .AddSqlServer() - .AddDbContext(options => + services.AddDbContext(options => options.UseSqlServer(Configuration[StoreConfig.ConnectionStringKey.Replace("__",":")])); } diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs index 4dbc678d59..a3c61a4c9a 100644 --- a/src/MusicStore/StartupNtlmAuthentication.cs +++ b/src/MusicStore/StartupNtlmAuthentication.cs @@ -52,9 +52,7 @@ namespace MusicStore services.Configure(Configuration.GetSection("AppSettings")); // Add EF services to the services container - services.AddEntityFramework() - .AddSqlServer() - .AddDbContext(options => + services.AddDbContext(options => options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); // Add Identity services to the services container diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index bcef87c741..a833f15d42 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -57,16 +57,12 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => + services.AddDbContext(options => options.UseInMemoryDatabase()); } else { - services.AddEntityFramework() - .AddSqlServer() - .AddDbContext(options => + services.AddDbContext(options => options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); } diff --git a/test/MusicStore.Test/CartSummaryComponentTest.cs b/test/MusicStore.Test/CartSummaryComponentTest.cs index 9233fac327..56c8c2c2c0 100644 --- a/test/MusicStore.Test/CartSummaryComponentTest.cs +++ b/test/MusicStore.Test/CartSummaryComponentTest.cs @@ -21,9 +21,7 @@ namespace MusicStore.Components { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs index 8365ba7fe3..5966a2cec3 100644 --- a/test/MusicStore.Test/CheckoutControllerTest.cs +++ b/test/MusicStore.Test/CheckoutControllerTest.cs @@ -23,9 +23,7 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/GenreMenuComponentTest.cs b/test/MusicStore.Test/GenreMenuComponentTest.cs index f0c9b02d3c..7f347584af 100644 --- a/test/MusicStore.Test/GenreMenuComponentTest.cs +++ b/test/MusicStore.Test/GenreMenuComponentTest.cs @@ -17,9 +17,7 @@ namespace MusicStore.Components public GenreMenuComponentTest() { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs index cb2fbe3d4b..1b3f8ec0ee 100644 --- a/test/MusicStore.Test/HomeControllerTest.cs +++ b/test/MusicStore.Test/HomeControllerTest.cs @@ -19,9 +19,7 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs index 4c7b63618d..54742402df 100644 --- a/test/MusicStore.Test/ManageControllerTest.cs +++ b/test/MusicStore.Test/ManageControllerTest.cs @@ -24,9 +24,7 @@ namespace MusicStore.Controllers public ManageControllerTest() { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); services.AddIdentity() .AddEntityFrameworkStores(); diff --git a/test/MusicStore.Test/Models/ShoppingCartTest.cs b/test/MusicStore.Test/Models/ShoppingCartTest.cs index 1f3eed93ec..cd130d4834 100644 --- a/test/MusicStore.Test/Models/ShoppingCartTest.cs +++ b/test/MusicStore.Test/Models/ShoppingCartTest.cs @@ -46,9 +46,7 @@ namespace MusicStore.Test public ShoppingCartFixture() { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs index 437d2bba72..4b521b947d 100644 --- a/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -26,9 +26,7 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); services.AddMvc(); diff --git a/test/MusicStore.Test/StoreControllerTest.cs b/test/MusicStore.Test/StoreControllerTest.cs index bd275ed83f..0093ff1bf0 100644 --- a/test/MusicStore.Test/StoreControllerTest.cs +++ b/test/MusicStore.Test/StoreControllerTest.cs @@ -19,9 +19,7 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddEntityFramework() - .AddInMemoryDatabase() - .AddDbContext(options => options.UseInMemoryDatabase()); + services.AddDbContext(options => options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); }