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

Handle IBuilder rename to IApplicationBuilder.

This commit is contained in:
Chris Ross 2014-09-10 12:14:50 -07:00
parent 35a08eb558
commit d7f5c81b13
6 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DiagnosticsPages.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.21706.0 VisualStudioVersion = 14.0.22013.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{509A6F36-AD80-4A18-B5B1-717D38DFF29D}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{509A6F36-AD80-4A18-B5B1-717D38DFF29D}"
EndProject EndProject
@ -15,6 +15,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ErrorPageSample", "samples\
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PageGenerator", "src\PageGenerator\PageGenerator.kproj", "{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PageGenerator", "src\PageGenerator\PageGenerator.kproj", "{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0557697-8D86-4DF3-A385-B0BFA9596189}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU

2
samples/ErrorPageSample/Startup.cs
View File

@ -5,7 +5,7 @@ namespace ErrorPageSample
{ {
public class Startup public class Startup
{ {
public void Configure(IBuilder app) public void Configure(IApplicationBuilder app)
{ {
app.UseErrorPage(); app.UseErrorPage();
app.Run(context => app.Run(context =>

2
samples/WelcomePageSample/Startup.cs
View File

@ -5,7 +5,7 @@ namespace WelcomePageSample
{ {
public class Startup public class Startup
{ {
public void Configure(IBuilder app) public void Configure(IApplicationBuilder app)
{ {
app.UseWelcomePage(); app.UseWelcomePage();
} }

8
src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
View File

@ -10,7 +10,7 @@ using Microsoft.AspNet.Diagnostics;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNet.Builder
{ {
/// <summary> /// <summary>
/// IBuilder extensions for the DiagnosticsPageMiddleware. /// IApplicationBuilder extensions for the DiagnosticsPageMiddleware.
/// </summary> /// </summary>
public static class DiagnosticsPageExtensions public static class DiagnosticsPageExtensions
{ {
@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Builder
/// <param name="builder"></param> /// <param name="builder"></param>
/// <param name="options"></param> /// <param name="options"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseDiagnosticsPage(this IBuilder builder, DiagnosticsPageOptions options) public static IApplicationBuilder UseDiagnosticsPage(this IApplicationBuilder builder, DiagnosticsPageOptions options)
{ {
if (builder == null) if (builder == null)
{ {
@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Builder
/// <param name="builder"></param> /// <param name="builder"></param>
/// <param name="path"></param> /// <param name="path"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseDiagnosticsPage(this IBuilder builder, PathString path) public static IApplicationBuilder UseDiagnosticsPage(this IApplicationBuilder builder, PathString path)
{ {
return UseDiagnosticsPage(builder, new DiagnosticsPageOptions { Path = path }); return UseDiagnosticsPage(builder, new DiagnosticsPageOptions { Path = path });
} }
@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Builder
/// </summary> /// </summary>
/// <param name="builder"></param> /// <param name="builder"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseDiagnosticsPage(this IBuilder builder) public static IApplicationBuilder UseDiagnosticsPage(this IApplicationBuilder builder)
{ {
return UseDiagnosticsPage(builder, new DiagnosticsPageOptions()); return UseDiagnosticsPage(builder, new DiagnosticsPageOptions());
} }

12
src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
View File

@ -1,25 +1,23 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNet.Builder
{ {
/// <summary> /// <summary>
/// IBuilder extension methods for the ErrorPageMiddleware. /// IApplicationBuilder extension methods for the ErrorPageMiddleware.
/// </summary> /// </summary>
public static class ErrorPageExtensions public static class ErrorPageExtensions
{ {
/// <summary> /// <summary>
/// Captures synchronous and asynchronous exceptions from the pipeline and generates HTML error responses. /// Captures synchronous and asynchronous exceptions from the pipeline and generates HTML error responses.
/// Full error details are only displayed by default if 'host.AppMode' is set to 'development' in the IBuilder.Properties. /// Full error details are only displayed by default if 'host.AppMode' is set to 'development' in the IApplicationBuilder.Properties.
/// </summary> /// </summary>
/// <param name="builder"></param> /// <param name="builder"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseErrorPage(this IBuilder builder) public static IApplicationBuilder UseErrorPage(this IApplicationBuilder builder)
{ {
if (builder == null) if (builder == null)
{ {
@ -31,12 +29,12 @@ namespace Microsoft.AspNet.Builder
/// <summary> /// <summary>
/// Captures synchronous and asynchronous exceptions from the pipeline and generates HTML error responses. /// Captures synchronous and asynchronous exceptions from the pipeline and generates HTML error responses.
/// Full error details are only displayed by default if 'host.AppMode' is set to 'development' in the IBuilder.Properties. /// Full error details are only displayed by default if 'host.AppMode' is set to 'development' in the IApplicationBuilder.Properties.
/// </summary> /// </summary>
/// <param name="builder"></param> /// <param name="builder"></param>
/// <param name="options"></param> /// <param name="options"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseErrorPage(this IBuilder builder, ErrorPageOptions options) public static IApplicationBuilder UseErrorPage(this IApplicationBuilder builder, ErrorPageOptions options)
{ {
if (builder == null) if (builder == null)
{ {

10
src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
View File

@ -9,7 +9,7 @@ using Microsoft.AspNet.Diagnostics;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNet.Builder
{ {
/// <summary> /// <summary>
/// IBuilder extensions for the WelcomePageMiddleware. /// IApplicationBuilder extensions for the WelcomePageMiddleware.
/// </summary> /// </summary>
public static class WelcomePageExtensions public static class WelcomePageExtensions
{ {
@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Builder
/// <param name="builder"></param> /// <param name="builder"></param>
/// <param name="options"></param> /// <param name="options"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseWelcomePage(this IBuilder builder, WelcomePageOptions options) public static IApplicationBuilder UseWelcomePage(this IApplicationBuilder builder, WelcomePageOptions options)
{ {
if (builder == null) if (builder == null)
{ {
@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Builder
/// <param name="builder"></param> /// <param name="builder"></param>
/// <param name="path"></param> /// <param name="path"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseWelcomePage(this IBuilder builder, PathString path) public static IApplicationBuilder UseWelcomePage(this IApplicationBuilder builder, PathString path)
{ {
return UseWelcomePage(builder, new WelcomePageOptions { Path = path }); return UseWelcomePage(builder, new WelcomePageOptions { Path = path });
} }
@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Builder
/// <param name="builder"></param> /// <param name="builder"></param>
/// <param name="path"></param> /// <param name="path"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseWelcomePage(this IBuilder builder, string path) public static IApplicationBuilder UseWelcomePage(this IApplicationBuilder builder, string path)
{ {
return UseWelcomePage(builder, new WelcomePageOptions { Path = new PathString(path) }); return UseWelcomePage(builder, new WelcomePageOptions { Path = new PathString(path) });
} }
@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Builder
/// </summary> /// </summary>
/// <param name="builder"></param> /// <param name="builder"></param>
/// <returns></returns> /// <returns></returns>
public static IBuilder UseWelcomePage(this IBuilder builder) public static IApplicationBuilder UseWelcomePage(this IApplicationBuilder builder)
{ {
return UseWelcomePage(builder, new WelcomePageOptions()); return UseWelcomePage(builder, new WelcomePageOptions());
} }