From dc34c630b7ee29852bc047c9bf93e5dec5fdcf46 Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Tue, 15 Mar 2016 15:32:08 -0700 Subject: [PATCH] Go back to using app service provider as EF internal service provider when using in memory --- shared/Mocks/StartupOpenIdConnectTesting.cs | 5 +++-- shared/Mocks/StartupSocialTesting.cs | 5 +++-- src/MusicStore/Startup.cs | 5 +++-- src/MusicStore/StartupOpenIdConnect.cs | 5 +++-- 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 +++- 12 files changed, 36 insertions(+), 16 deletions(-) diff --git a/shared/Mocks/StartupOpenIdConnectTesting.cs b/shared/Mocks/StartupOpenIdConnectTesting.cs index 7bfbbf3d0b..d805908908 100644 --- a/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -47,8 +47,9 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddDbContext(options => - options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); } else { diff --git a/shared/Mocks/StartupSocialTesting.cs b/shared/Mocks/StartupSocialTesting.cs index c37ea2967d..5639bd6226 100644 --- a/shared/Mocks/StartupSocialTesting.cs +++ b/shared/Mocks/StartupSocialTesting.cs @@ -53,8 +53,9 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddDbContext(options => - options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); } else { diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index 921d2b6452..9edaefb538 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -42,8 +42,9 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddDbContext(options => - options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); } else { diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index a833f15d42..a994abbb30 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -57,8 +57,9 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddDbContext(options => - options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); } else { diff --git a/test/MusicStore.Test/CartSummaryComponentTest.cs b/test/MusicStore.Test/CartSummaryComponentTest.cs index 56c8c2c2c0..b82fe7109b 100644 --- a/test/MusicStore.Test/CartSummaryComponentTest.cs +++ b/test/MusicStore.Test/CartSummaryComponentTest.cs @@ -21,7 +21,9 @@ namespace MusicStore.Components { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs index 5966a2cec3..532bfece0d 100644 --- a/test/MusicStore.Test/CheckoutControllerTest.cs +++ b/test/MusicStore.Test/CheckoutControllerTest.cs @@ -23,7 +23,9 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/GenreMenuComponentTest.cs b/test/MusicStore.Test/GenreMenuComponentTest.cs index 7f347584af..1240e0432c 100644 --- a/test/MusicStore.Test/GenreMenuComponentTest.cs +++ b/test/MusicStore.Test/GenreMenuComponentTest.cs @@ -17,7 +17,9 @@ namespace MusicStore.Components public GenreMenuComponentTest() { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs index 1b3f8ec0ee..bb05167c8b 100644 --- a/test/MusicStore.Test/HomeControllerTest.cs +++ b/test/MusicStore.Test/HomeControllerTest.cs @@ -19,7 +19,9 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs index 54742402df..30f4781af8 100644 --- a/test/MusicStore.Test/ManageControllerTest.cs +++ b/test/MusicStore.Test/ManageControllerTest.cs @@ -24,7 +24,9 @@ namespace MusicStore.Controllers public ManageControllerTest() { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); services.AddIdentity() .AddEntityFrameworkStores(); diff --git a/test/MusicStore.Test/Models/ShoppingCartTest.cs b/test/MusicStore.Test/Models/ShoppingCartTest.cs index cd130d4834..1bebc69037 100644 --- a/test/MusicStore.Test/Models/ShoppingCartTest.cs +++ b/test/MusicStore.Test/Models/ShoppingCartTest.cs @@ -46,7 +46,9 @@ namespace MusicStore.Test public ShoppingCartFixture() { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs index 4b521b947d..3c1328372c 100644 --- a/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -26,7 +26,9 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); services.AddMvc(); diff --git a/test/MusicStore.Test/StoreControllerTest.cs b/test/MusicStore.Test/StoreControllerTest.cs index 0093ff1bf0..7c4640774c 100644 --- a/test/MusicStore.Test/StoreControllerTest.cs +++ b/test/MusicStore.Test/StoreControllerTest.cs @@ -19,7 +19,9 @@ namespace MusicStore.Controllers { var services = new ServiceCollection(); - services.AddDbContext(options => options.UseInMemoryDatabase()); + services + .AddEntityFrameworkInMemoryDatabase() + .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); _serviceProvider = services.BuildServiceProvider(); }