From d96fbdba93b85210963ccef324c27d8c9368ab6d Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Thu, 3 Sep 2015 11:43:29 -0700 Subject: [PATCH] Renamed the directories --- DiagnosticsPages.sln | 4 ++-- .../DeveloperExceptionPageSample.xproj | 0 .../Startup.cs | 0 .../project.json | 0 .../wwwroot/Readme.md | 0 .../ExceptionHandlerSample.xproj | 0 .../{ErrorHandlerSample => ExceptionHandlerSample}/Startup.cs | 0 .../project.json | 0 .../wwwroot/error.html | 0 .../ExceptionHandler/ExceptionHandlerExtensions.cs | 4 ++-- 10 files changed, 4 insertions(+), 4 deletions(-) rename samples/{ErrorPageSample => DeveloperExceptionPageSample}/DeveloperExceptionPageSample.xproj (100%) rename samples/{ErrorPageSample => DeveloperExceptionPageSample}/Startup.cs (100%) rename samples/{ErrorPageSample => DeveloperExceptionPageSample}/project.json (100%) rename samples/{ErrorPageSample => DeveloperExceptionPageSample}/wwwroot/Readme.md (100%) rename samples/{ErrorHandlerSample => ExceptionHandlerSample}/ExceptionHandlerSample.xproj (100%) rename samples/{ErrorHandlerSample => ExceptionHandlerSample}/Startup.cs (100%) rename samples/{ErrorHandlerSample => ExceptionHandlerSample}/project.json (100%) rename samples/{ErrorHandlerSample => ExceptionHandlerSample}/wwwroot/error.html (100%) diff --git a/DiagnosticsPages.sln b/DiagnosticsPages.sln index ee44b38077..4cdd542870 100644 --- a/DiagnosticsPages.sln +++ b/DiagnosticsPages.sln @@ -11,7 +11,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WelcomePageSample", "sample EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics", "src\Microsoft.AspNet.Diagnostics\Microsoft.AspNet.Diagnostics.xproj", "{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DeveloperExceptionPageSample", "samples\ErrorPageSample\DeveloperExceptionPageSample.xproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.xproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PageGenerator", "src\PageGenerator\PageGenerator.xproj", "{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}" EndProject @@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AF90579-B EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Tests", "test\Microsoft.AspNet.Diagnostics.Tests\Microsoft.AspNet.Diagnostics.Tests.xproj", "{994351B4-7B2A-4139-8B72-72C5BB5CC618}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExceptionHandlerSample", "samples\ErrorHandlerSample\ExceptionHandlerSample.xproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExceptionHandlerSample", "samples\ExceptionHandlerSample\ExceptionHandlerSample.xproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Entity", "src\Microsoft.AspNet.Diagnostics.Entity\Microsoft.AspNet.Diagnostics.Entity.xproj", "{4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}" EndProject diff --git a/samples/ErrorPageSample/DeveloperExceptionPageSample.xproj b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj similarity index 100% rename from samples/ErrorPageSample/DeveloperExceptionPageSample.xproj rename to samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj diff --git a/samples/ErrorPageSample/Startup.cs b/samples/DeveloperExceptionPageSample/Startup.cs similarity index 100% rename from samples/ErrorPageSample/Startup.cs rename to samples/DeveloperExceptionPageSample/Startup.cs diff --git a/samples/ErrorPageSample/project.json b/samples/DeveloperExceptionPageSample/project.json similarity index 100% rename from samples/ErrorPageSample/project.json rename to samples/DeveloperExceptionPageSample/project.json diff --git a/samples/ErrorPageSample/wwwroot/Readme.md b/samples/DeveloperExceptionPageSample/wwwroot/Readme.md similarity index 100% rename from samples/ErrorPageSample/wwwroot/Readme.md rename to samples/DeveloperExceptionPageSample/wwwroot/Readme.md diff --git a/samples/ErrorHandlerSample/ExceptionHandlerSample.xproj b/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj similarity index 100% rename from samples/ErrorHandlerSample/ExceptionHandlerSample.xproj rename to samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj diff --git a/samples/ErrorHandlerSample/Startup.cs b/samples/ExceptionHandlerSample/Startup.cs similarity index 100% rename from samples/ErrorHandlerSample/Startup.cs rename to samples/ExceptionHandlerSample/Startup.cs diff --git a/samples/ErrorHandlerSample/project.json b/samples/ExceptionHandlerSample/project.json similarity index 100% rename from samples/ErrorHandlerSample/project.json rename to samples/ExceptionHandlerSample/project.json diff --git a/samples/ErrorHandlerSample/wwwroot/error.html b/samples/ExceptionHandlerSample/wwwroot/error.html similarity index 100% rename from samples/ErrorHandlerSample/wwwroot/error.html rename to samples/ExceptionHandlerSample/wwwroot/error.html diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs index e3793f91e0..2be65866f0 100644 --- a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs +++ b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs @@ -71,10 +71,10 @@ namespace Microsoft.AspNet.Builder { var subAppBuilder = app.New(); configure(subAppBuilder); - var errorPipeline = subAppBuilder.Build(); + var exceptionHandlerPipeline = subAppBuilder.Build(); var options = new ExceptionHandlerOptions() { - ExceptionHandler = errorPipeline + ExceptionHandler = exceptionHandlerPipeline }; return app.UseMiddleware(options); }