From 4d5e1076c937c65b8bc29cf22c0c5fc88432a493 Mon Sep 17 00:00:00 2001
From: damianedwards <damian@damianedwards.com>
Date: Tue, 2 May 2017 22:32:31 -0700
Subject: [PATCH] Remove the DeveloperExceptionPage middleware from
 WebHost.CreateDefaultBuilder: - The templates still have it explicitly and
 it's best to have middleware added by the app directly

---
 src/Microsoft.AspNetCore/WebHost.cs           |  1 -
 .../WebHostStartupFilter.cs                   | 26 -------------------
 .../WebHostFunctionalTests.cs                 |  5 ----
 .../CreateDefaultBuilderApp/Program.cs        |  4 ---
 4 files changed, 36 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore/WebHostStartupFilter.cs

diff --git a/src/Microsoft.AspNetCore/WebHost.cs b/src/Microsoft.AspNetCore/WebHost.cs
index 51b5a6e160..303dffaf7a 100644
--- a/src/Microsoft.AspNetCore/WebHost.cs
+++ b/src/Microsoft.AspNetCore/WebHost.cs
@@ -188,7 +188,6 @@ namespace Microsoft.AspNetCore
                 })
                 .ConfigureServices(services =>
                 {
-                    services.AddSingleton<IStartupFilter, WebHostStartupFilter>();
                     services.AddTransient<IConfigureOptions<KestrelServerOptions>, KestrelServerOptionsSetup>();
                 });
 
diff --git a/src/Microsoft.AspNetCore/WebHostStartupFilter.cs b/src/Microsoft.AspNetCore/WebHostStartupFilter.cs
deleted file mode 100644
index 43690799ce..0000000000
--- a/src/Microsoft.AspNetCore/WebHostStartupFilter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Microsoft.AspNetCore
-{
-    internal class WebHostStartupFilter : IStartupFilter
-    {
-        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
-        {
-            return app =>
-            {
-                var env = app.ApplicationServices.GetService<IHostingEnvironment>();
-                if (env.IsDevelopment())
-                {
-                    app.UseDeveloperExceptionPage();
-                }
-                next(app);
-            };
-        }
-    }
-}
diff --git a/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
index fa24b34684..39101acf2c 100644
--- a/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
+++ b/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
@@ -54,10 +54,8 @@ namespace Microsoft.AspNetCore.Tests
             await ExecuteTestApp(applicationName, async (deploymentResult, logger) =>
             {
                 var response = await RetryHelper.RetryRequest(() => deploymentResult.HttpClient.GetAsync(string.Empty), logger, deploymentResult.HostShutdownToken);
-                var errorResponse = await RetryHelper.RetryRequest(() => deploymentResult.HttpClient.GetAsync("/error"), logger, deploymentResult.HostShutdownToken);
 
                 var responseText = await response.Content.ReadAsStringAsync();
-                var errorResponseText = await errorResponse.Content.ReadAsStringAsync();
                 try
                 {
                     // Assert server is Kestrel
@@ -65,9 +63,6 @@ namespace Microsoft.AspNetCore.Tests
 
                     // The application name will be sent in response when all asserts succeed in the test app.
                     Assert.Equal(applicationName, responseText);
-
-                    // Assert UseDeveloperExceptionPage is called in WebHostStartupFilter.
-                    Assert.Contains("An unhandled exception occurred while processing the request.", errorResponseText);
                 }
                 catch (XunitException)
                 {
diff --git a/test/TestSites/CreateDefaultBuilderApp/Program.cs b/test/TestSites/CreateDefaultBuilderApp/Program.cs
index eb7eeaaa03..ab302e8f96 100644
--- a/test/TestSites/CreateDefaultBuilderApp/Program.cs
+++ b/test/TestSites/CreateDefaultBuilderApp/Program.cs
@@ -30,10 +30,6 @@ namespace CreateDefaultBuilderApp
                 })
                 .Configure(app =>
                 {
-                    app.Map("/error", subApp =>
-                    {
-                        subApp.Run(context => throw new Exception());
-                    });
                     app.Run(context =>
                     {
                         return context.Response.WriteAsync(responseMessage);