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

Merge branch 'release' into dev

This commit is contained in:
Rowan Miller 2016-04-18 14:13:20 -07:00
parent 673eae72c0 a8bb790596
commit c4888ba13a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs
View File

@ -14,8 +14,7 @@ namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// Captures synchronous and asynchronous database related exceptions from the pipeline that may be resolved using Entity Framework /// Captures synchronous and asynchronous database related exceptions from the pipeline that may be resolved using Entity Framework
/// migrations. When these exceptions occur an HTML response with details of possible actions to resolve the issue is generated. The /// migrations. When these exceptions occur an HTML response with details of possible actions to resolve the issue is generated.
/// options for the middleware are set to display the maximum amount of information available.
/// </summary> /// </summary>
/// <param name="app">The <see cref="IApplicationBuilder"/> to register the middleware with.</param> /// <param name="app">The <see cref="IApplicationBuilder"/> to register the middleware with.</param>
/// <returns>The same <see cref="IApplicationBuilder"/> instance so that multiple calls can be chained.</returns> /// <returns>The same <see cref="IApplicationBuilder"/> instance so that multiple calls can be chained.</returns>
@ -26,7 +25,7 @@ namespace Microsoft.AspNetCore.Builder
throw new ArgumentNullException(nameof(app)); throw new ArgumentNullException(nameof(app));
} }
return app.UseMiddleware<DatabaseErrorPageMiddleware>(); return app.UseDatabaseErrorPage(new DatabaseErrorPageOptions());
} }
/// <summary> /// <summary>

2
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Builder
throw new ArgumentNullException(nameof(app)); throw new ArgumentNullException(nameof(app));
} }
return app.UseMiddleware<MigrationsEndPointMiddleware>(); return app.UseMigrationsEndPoint(new MigrationsEndPointOptions());
} }
/// <summary> /// <summary>