From f1d588bb546d6b3b25bc72791f4058c54bf2be8c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sat, 12 Mar 2016 16:32:59 -0800
Subject: [PATCH] * Fixing missed changes in EF reaction * Remove npm install
 warning. * Target minimal tfm in Diagnostics.Abstractions

---
 .../project.json                                            | 5 ++---
 src/Microsoft.AspNetCore.Diagnostics/package.json           | 1 +
 src/PageGenerator/project.json                              | 1 -
 .../DatabaseErrorPageMiddlewareTest.cs                      | 6 +++---
 .../MigrationsEndPointMiddlewareTest.cs                     | 6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
index 2912e03a10..57cab6dd5d 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
@@ -19,13 +19,12 @@
     "xmlDoc": true
   },
   "frameworks": {
-    "net451": { },
-    "netstandard1.3": {
+    "netstandard1.0": {
       "dependencies": {
         "System.Resources.ResourceManager": "4.0.1-*"
       },
       "imports": [
-        "dotnet5.4"
+        "dotnet5.1"
       ]
     }
   }
diff --git a/src/Microsoft.AspNetCore.Diagnostics/package.json b/src/Microsoft.AspNetCore.Diagnostics/package.json
index 09fa624b59..a89dd3241c 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/package.json
+++ b/src/Microsoft.AspNetCore.Diagnostics/package.json
@@ -2,6 +2,7 @@
   "name": "DiagnosticsPages",
   "version": "0.0.0",
   "description": "",
+  "private": true,
   "devDependencies": {
     "grunt": "~0.4.4",
     "grunt-cli": "~0.1.13",
diff --git a/src/PageGenerator/project.json b/src/PageGenerator/project.json
index ff3da9fac1..8beda8f2ac 100644
--- a/src/PageGenerator/project.json
+++ b/src/PageGenerator/project.json
@@ -14,7 +14,6 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
-    "dnx451": {},
     "netstandardapp1.5": {
       "dependencies": {
         "System.Console": "4.0.0-*"
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 9e4bee1955..287f7aff1c 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -267,7 +267,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     })
                     .ConfigureServices(services =>
                     {
-                        services.AddAddEntityFrameworkSqlServer();
+                        services.AddEntityFrameworkSqlServer();
                         services.AddScoped<BloggingContextWithMigrations>();
 
                         var optionsBuilder = new DbContextOptionsBuilder();
@@ -303,7 +303,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     .ConfigureServices(
                     services =>
                     {
-                        services.AddEntityFramework().AddSqlServer();
+                        services.AddEntityFramework().AddEntityFrameworkSqlServer();
                         var optionsBuilder = new DbContextOptionsBuilder();
                         if (!PlatformHelper.IsMono)
                         {
@@ -426,7 +426,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     .ConfigureServices(services =>
                     {
                         services.AddEntityFramework()
-                            .AddSqlServer();
+                            .AddEntityFrameworkSqlServer();
 
                         services.AddScoped<TContext>();
 
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index af90453c47..045e17c7c5 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     })
                     .ConfigureServices(services =>
                     {
-                        services.AddEntityFramework().AddSqlServer();
+                        services.AddEntityFramework().AddEntityFrameworkSqlServer();
                         services.AddScoped<BloggingContextWithMigrations>();
                         services.AddSingleton(optionsBuilder.Options);
                     });
@@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
         {
             var builder = new WebHostBuilder()
                 .Configure(app => app.UseMigrationsEndPoint())
-                .ConfigureServices(services => services.AddEntityFramework().AddSqlServer());
+                .ConfigureServices(services => services.AddEntityFramework().AddEntityFrameworkSqlServer());
             var server = new TestServer(builder);
 
             var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>
@@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     .Configure(app => app.UseMigrationsEndPoint())
                     .ConfigureServices(services =>
                     {
-                        services.AddEntityFramework().AddSqlServer();
+                        services.AddEntityFramework().AddEntityFrameworkSqlServer();
                         services.AddScoped<BloggingContextWithSnapshotThatThrows>();
                         services.AddSingleton(optionsBuilder.Options);
                     });