From f76583b18b0024f7c3be0ea9a93bce2631bfe22d Mon Sep 17 00:00:00 2001
From: mikary <mikary@microsoft.com>
Date: Fri, 19 Dec 2014 10:47:45 -0800
Subject: [PATCH] Reacting to API changes in EntityFramework

---
 .../DatabaseErrorPageMiddlewareTest.cs        | 20 ++++++++++++-------
 .../MigrationsEndPointMiddlewareTest.cs       |  6 ++++--
 .../SqlServerTestStore.cs                     |  5 ++++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index e62828c312..336eb39834 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -235,7 +235,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                     {
                         services.AddEntityFramework().AddSqlServer();
                         services.AddScoped<BloggingContextWithMigrations>();
-                        services.AddInstance<DbContextOptions>(new DbContextOptions().UseSqlServer(database.ConnectionString));
+
+                        var contextOptions = new DbContextOptions();
+                        contextOptions.UseSqlServer(database.ConnectionString);
+                        services.AddInstance<DbContextOptions>(contextOptions);
                     });
 
                     var options = DatabaseErrorPageOptions.ShowAll;
@@ -268,9 +271,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         services.AddEntityFramework()
                             .AddSqlServer();
 
-                        services.AddInstance<DbContextOptions>(
-                            new DbContextOptions()
-                                .UseSqlServer(database.ConnectionString));
+                        var options = new DbContextOptions();
+                        options.UseSqlServer(database.ConnectionString);
+
+                        services.AddInstance<DbContextOptions>(options);
                     });
 
                     app.UseDatabaseErrorPage();
@@ -386,9 +390,11 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                             .AddSqlServer();
 
                         services.AddScoped<TContext>();
-                        services.AddInstance<DbContextOptions>(
-                            new DbContextOptions()
-                                .UseSqlServer(database.ConnectionString));
+
+                        var options = new DbContextOptions();
+                        options.UseSqlServer(database.ConnectionString);
+
+                        services.AddInstance<DbContextOptions>(options);
                     });
 
                     app.UseDatabaseErrorPage();
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index 66fa99abc7..711cd2955d 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -65,7 +65,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         {
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                var options = new DbContextOptions().UseSqlServer(database.ConnectionString);
+                var options = new DbContextOptions();
+                options.UseSqlServer(database.ConnectionString);
                 var path = useCustomPath ? new PathString("/EndPoints/ApplyMyMigrations") : MigrationsEndPointOptions.DefaultPath;
 
                 TestServer server = TestServer.Create(app =>
@@ -183,7 +184,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         {
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                var options = new DbContextOptions().UseSqlServer(database.ConnectionString);
+                var options = new DbContextOptions();
+                options.UseSqlServer(database.ConnectionString);
 
                 TestServer server = TestServer.Create(app =>
                 {
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
index d4752ab46f..9082d4b2bb 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
@@ -40,7 +40,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
         private void EnsureDeleted()
         {
-            using (var db = new DbContext(new DbContextOptions().UseSqlServer(_connectionString)))
+            var options = new DbContextOptions();
+            options.UseSqlServer(_connectionString);
+
+            using (var db = new DbContext(options))
             {
                 db.Database.EnsureDeleted();
             }