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

* Fixing missed changes in EF reaction 

* Remove npm install warning.
* Target minimal tfm in Diagnostics.Abstractions
This commit is contained in:
Pranav K 2016-03-12 16:32:59 -08:00
parent 526e5c8032
commit f1d588bb54
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
View File

@ -19,13 +19,12 @@
"xmlDoc": true "xmlDoc": true
}, },
"frameworks": { "frameworks": {
"net451": { }, "netstandard1.0": {
"netstandard1.3": {
"dependencies": { "dependencies": {
"System.Resources.ResourceManager": "4.0.1-*" "System.Resources.ResourceManager": "4.0.1-*"
}, },
"imports": [ "imports": [
"dotnet5.4" "dotnet5.1"
] ]
} }
} }

1
src/Microsoft.AspNetCore.Diagnostics/package.json
View File

@ -2,6 +2,7 @@
"name": "DiagnosticsPages", "name": "DiagnosticsPages",
"version": "0.0.0", "version": "0.0.0",
"description": "", "description": "",
"private": true,
"devDependencies": { "devDependencies": {
"grunt": "~0.4.4", "grunt": "~0.4.4",
"grunt-cli": "~0.1.13", "grunt-cli": "~0.1.13",

1
src/PageGenerator/project.json
View File

@ -14,7 +14,6 @@
"Microsoft.NETCore.Platforms": "1.0.1-*" "Microsoft.NETCore.Platforms": "1.0.1-*"
}, },
"frameworks": { "frameworks": {
"dnx451": {},
"netstandardapp1.5": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"System.Console": "4.0.0-*" "System.Console": "4.0.0-*"

6
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
View File

@ -267,7 +267,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
}) })
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.AddAddEntityFrameworkSqlServer(); services.AddEntityFrameworkSqlServer();
services.AddScoped<BloggingContextWithMigrations>(); services.AddScoped<BloggingContextWithMigrations>();
var optionsBuilder = new DbContextOptionsBuilder(); var optionsBuilder = new DbContextOptionsBuilder();
@ -303,7 +303,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
.ConfigureServices( .ConfigureServices(
services => services =>
{ {
services.AddEntityFramework().AddSqlServer(); services.AddEntityFramework().AddEntityFrameworkSqlServer();
var optionsBuilder = new DbContextOptionsBuilder(); var optionsBuilder = new DbContextOptionsBuilder();
if (!PlatformHelper.IsMono) if (!PlatformHelper.IsMono)
{ {
@ -426,7 +426,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.AddEntityFramework() services.AddEntityFramework()
.AddSqlServer(); .AddEntityFrameworkSqlServer();
services.AddScoped<TContext>(); services.AddScoped<TContext>();

6
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
View File

@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
}) })
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.AddEntityFramework().AddSqlServer(); services.AddEntityFramework().AddEntityFrameworkSqlServer();
services.AddScoped<BloggingContextWithMigrations>(); services.AddScoped<BloggingContextWithMigrations>();
services.AddSingleton(optionsBuilder.Options); services.AddSingleton(optionsBuilder.Options);
}); });
@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{ {
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.Configure(app => app.UseMigrationsEndPoint()) .Configure(app => app.UseMigrationsEndPoint())
.ConfigureServices(services => services.AddEntityFramework().AddSqlServer()); .ConfigureServices(services => services.AddEntityFramework().AddEntityFrameworkSqlServer());
var server = new TestServer(builder); var server = new TestServer(builder);
var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>> var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>
@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
.Configure(app => app.UseMigrationsEndPoint()) .Configure(app => app.UseMigrationsEndPoint())
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.AddEntityFramework().AddSqlServer(); services.AddEntityFramework().AddEntityFrameworkSqlServer();
services.AddScoped<BloggingContextWithSnapshotThatThrows>(); services.AddScoped<BloggingContextWithSnapshotThatThrows>();
services.AddSingleton(optionsBuilder.Options); services.AddSingleton(optionsBuilder.Options);
}); });