From 3f6b558cf34aa2f57d0e8e6749f4a2c1a4c68743 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Thu, 25 Aug 2016 17:21:29 -0700
Subject: [PATCH] Revert "Remove existing implementation of
 StartupExceptionPage and use the one in Common"

This reverts commit 83e0d4798eb4fd9113d06c54bba9d69faefa3d96.
---
 .../Internal/WebHost.cs                       |   43 +-
 .../Properties/Resources.Designer.cs          |   78 --
 .../Resources.resx                            |  129 --
 .../ExceptionPage/Views/ErrorPage.Designer.cs | 1055 -----------------
 .../ExceptionPage/Views/ErrorPage.cshtml      |  162 ---
 .../Startup/ExceptionPage/Views/ErrorPage.css |  195 ---
 .../Startup/ExceptionPage/Views/ErrorPage.js  |  192 ---
 .../ExceptionPage/Views/ErrorPageModel.cs     |   29 -
 .../Startup/StartupExceptionPage.cs           |  329 +++++
 src/Microsoft.AspNetCore.Hosting/project.json |   11 +-
 .../WebHostBuilderTests.cs                    |    8 +-
 11 files changed, 340 insertions(+), 1891 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Properties/Resources.Designer.cs
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Resources.resx
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.Designer.cs
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.cshtml
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.css
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.js
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPageModel.cs
 create mode 100644 src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs

diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
index 8098c5838f..c2a591b5b8 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
@@ -5,20 +5,16 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Threading;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Hosting.Views;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.StackTrace.Sources;
 
 namespace Microsoft.AspNetCore.Hosting.Internal
 {
@@ -172,44 +168,15 @@ namespace Microsoft.AspNetCore.Hosting.Internal
                 // Generate an HTML error page.
                 var hostingEnv = _applicationServices.GetRequiredService<IHostingEnvironment>();
                 var showDetailedErrors = hostingEnv.IsDevelopment() || _options.DetailedErrors;
+                var errorBytes = StartupExceptionPage.GenerateErrorHtml(showDetailedErrors, ex);
 
-                var model = new ErrorPageModel();
-                var runtimeType = Microsoft.Extensions.Internal.RuntimeEnvironment.RuntimeType;
-                model.RuntimeDisplayName = (runtimeType == "CoreCLR") ? ".NET Core" : runtimeType == "CLR" ? ".NET Framework" : "Mono";
-#if NETSTANDARD1_3
-                var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
-                var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();
-                var clrVersion = assemblyVersion;
-#else
-                var clrVersion = Environment.Version.ToString();
-#endif
-                model.RuntimeArchitecture = RuntimeInformation.ProcessArchitecture.ToString();
-                var currentAssembly = typeof(ErrorPage).GetTypeInfo().Assembly;
-                model.CurrentAssemblyVesion = currentAssembly
-                    .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-                    .InformationalVersion;
-                model.ClrVersion = clrVersion;
-                model.OperatingSystemDescription = RuntimeInformation.OSDescription;
-
-                if (showDetailedErrors)
-                {
-                    var exceptionDetailProvider = new ExceptionDetailsProvider(
-                        hostingEnv.ContentRootFileProvider,
-                        sourceCodeLineCount: 6);
-
-                    model.ErrorDetails = exceptionDetailProvider.GetDetails(ex);
-                }
-                else
-                {
-                    model.ErrorDetails = new ExceptionDetails[0];
-                }
-
-                var errorPage = new ErrorPage(model);
                 return context =>
                 {
                     context.Response.StatusCode = 500;
-                    context.Response.Headers["Cache-Control"] = "no-cache";
-                    return errorPage.ExecuteAsync(context);
+                    context.Response.Headers["Cache-Control"] = "private, max-age=0";
+                    context.Response.ContentType = "text/html; charset=utf-8";
+                    context.Response.ContentLength = errorBytes.Length;
+                    return context.Response.Body.WriteAsync(errorBytes, 0, errorBytes.Length);
                 };
             }
         }
diff --git a/src/Microsoft.AspNetCore.Hosting/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Hosting/Properties/Resources.Designer.cs
deleted file mode 100644
index 397c84eba2..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Hosting
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Hosting.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Internal Server Error
-        /// </summary>
-        internal static string ErrorPageHtml_Title
-        {
-            get { return GetString("ErrorPageHtml_Title"); }
-        }
-
-        /// <summary>
-        /// Internal Server Error
-        /// </summary>
-        internal static string FormatErrorPageHtml_Title()
-        {
-            return GetString("ErrorPageHtml_Title");
-        }
-
-        /// <summary>
-        /// An error occurred while starting the application.
-        /// </summary>
-        internal static string ErrorPageHtml_UnhandledException
-        {
-            get { return GetString("ErrorPageHtml_UnhandledException"); }
-        }
-
-        /// <summary>
-        /// An error occurred while starting the application.
-        /// </summary>
-        internal static string FormatErrorPageHtml_UnhandledException()
-        {
-            return GetString("ErrorPageHtml_UnhandledException");
-        }
-
-        /// <summary>
-        /// Unknown location
-        /// </summary>
-        internal static string ErrorPageHtml_UnknownLocation
-        {
-            get { return GetString("ErrorPageHtml_UnknownLocation"); }
-        }
-
-        /// <summary>
-        /// Unknown location
-        /// </summary>
-        internal static string FormatErrorPageHtml_UnknownLocation()
-        {
-            return GetString("ErrorPageHtml_UnknownLocation");
-        }
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Microsoft.AspNetCore.Hosting/Resources.resx b/src/Microsoft.AspNetCore.Hosting/Resources.resx
deleted file mode 100644
index 6af9630466..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Resources.resx
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ErrorPageHtml_Title" xml:space="preserve">
-    <value>Internal Server Error</value>
-  </data>
-  <data name="ErrorPageHtml_UnhandledException" xml:space="preserve">
-    <value>An error occurred while starting the application.</value>
-  </data>
-  <data name="ErrorPageHtml_UnknownLocation" xml:space="preserve">
-    <value>Unknown location</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.Designer.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.Designer.cs
deleted file mode 100644
index 52a6db45d3..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.Designer.cs
+++ /dev/null
@@ -1,1055 +0,0 @@
-namespace Microsoft.AspNetCore.Hosting.Views
-{
-#line 1 "ErrorPage.cshtml"
-using System
-
-#line default
-#line hidden
-    ;
-#line 2 "ErrorPage.cshtml"
-using System.Globalization
-
-#line default
-#line hidden
-    ;
-#line 3 "ErrorPage.cshtml"
-using System.Linq
-
-#line default
-#line hidden
-    ;
-#line 4 "ErrorPage.cshtml"
-using System.Net
-
-#line default
-#line hidden
-    ;
-#line 5 "ErrorPage.cshtml"
-using System.Reflection
-
-#line default
-#line hidden
-    ;
-#line 6 "ErrorPage.cshtml"
-using Microsoft.AspNetCore.Hosting.Views
-
-#line default
-#line hidden
-    ;
-    using System.Threading.Tasks;
-
-    internal class ErrorPage : Microsoft.Extensions.RazorViews.BaseView
-    {
-#line 9 "ErrorPage.cshtml"
-
-    public ErrorPage(ErrorPageModel model)
-    {
-        Model = model;
-    }
-
-    public ErrorPageModel Model { get; set; }
-
-#line default
-#line hidden
-        #line hidden
-        public ErrorPage()
-        {
-        }
-
-        #pragma warning disable 1998
-        public override async Task ExecuteAsync()
-        {
-            WriteLiteral("\r\n");
-#line 17 "ErrorPage.cshtml"
-  
-    Response.ContentType = "text/html; charset=utf-8";
-    var location = string.Empty;
-
-#line default
-#line hidden
-
-            WriteLiteral("<!DOCTYPE html>\r\n<html");
-            BeginWriteAttribute("lang", " lang=\"", 422, "\"", 483, 1);
-#line 22 "ErrorPage.cshtml"
-WriteAttributeValue("", 429, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 429, 54, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <head>\r\n        <meta charset=\"utf-8\" />\r\n        <title>");
-#line 25 "ErrorPage.cshtml"
-          Write(Resources.ErrorPageHtml_Title);
-
-#line default
-#line hidden
-            WriteLiteral(@"</title>
-        <style>
-            body {
-    font-family: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;
-    font-size: .813em;
-    color: #222;
-}
-
-h1, h2, h3, h4, h5 {
-    /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/
-    font-weight: 100;
-}
-
-h1 {
-    color: #44525e;
-    margin: 15px 0 15px 0;
-}
-
-h2 {
-    margin: 10px 5px 0 0;
-}
-
-h3 {
-    color: #363636;
-    margin: 5px 5px 0 0;
-}
-
-code {
-    font-family: Consolas, ""Courier New"", courier, monospace;
-}
-
-body .titleerror {
-    padding: 3px 3px 6px 3px;
-    display: block;
-    font-size: 1.5em;
-    font-weight: 100;
-}
-
-body .location {
-    margin: 3px 0 10px 30px;
-}
-
-#header {
-    font-size: 18px;
-    padding: 15px 0;
-    border-top: 1px #ddd solid;
-    border-bottom: 1px #ddd solid;
-    margin-bottom: 0;
-}
-
-    #header li {
-        display: inline;
-        margin: 5px;
-        padding: 5px;
-        color: #a0a0a0;
-        cursor: pointer;
-    }
-
-    #header .selected {
-        ba");
-            WriteLiteral(@"ckground: #44c5f2;
-        color: #fff;
-    }
-
-#stackpage ul {
-    list-style: none;
-    padding-left: 0;
-    margin: 0;
-    /*border-bottom: 1px #ddd solid;*/
-}
-
-#stackpage .details {
-    font-size: 1.2em;
-    padding: 3px;
-    color: #000;
-}
-
-#stackpage .stackerror {
-    padding: 5px;
-    border-bottom: 1px #ddd solid;
-}
-
-
-#stackpage .frame {
-    padding: 0;
-    margin: 0 0 0 30px;
-}
-
-    #stackpage .frame h3 {
-        padding: 2px;
-        margin: 0;
-    }
-
-#stackpage .source {
-    padding: 0 0 0 30px;
-}
-
-    #stackpage .source ol li {
-        font-family: Consolas, ""Courier New"", courier, monospace;
-        white-space: pre;
-        background-color: #fbfbfb;
-    }
-
-#stackpage .frame .source .highlight li span {
-    color: #FF0000;
-}
-
-#stackpage .source ol.collapsible li {
-    color: #888;
-}
-
-    #stackpage .source ol.collapsible li span {
-        color: #606060;
-    }
-
-.page table {
-    border-collapse: separate;
-    border-spacing: 0;
-    margin:");
-            WriteLiteral(@" 0 0 20px;
-}
-
-.page th {
-    vertical-align: bottom;
-    padding: 10px 5px 5px 5px;
-    font-weight: 400;
-    color: #a0a0a0;
-    text-align: left;
-}
-
-.page td {
-    padding: 3px 10px;
-}
-
-.page th, .page td {
-    border-right: 1px #ddd solid;
-    border-bottom: 1px #ddd solid;
-    border-left: 1px transparent solid;
-    border-top: 1px transparent solid;
-    box-sizing: border-box;
-}
-
-    .page th:last-child, .page td:last-child {
-        border-right: 1px transparent solid;
-    }
-
-.page .length {
-    text-align: right;
-}
-
-a {
-    color: #1ba1e2;
-    text-decoration: none;
-}
-
-    a:hover {
-        color: #13709e;
-        text-decoration: underline;
-    }
-
-.showRawException {
-    cursor: pointer;
-    color: #44c5f2;
-    background-color: transparent;
-    font-size: 1.2em;
-    text-align: left;
-    text-decoration: none;
-    display: inline-block;
-    border: 0;
-    padding: 0;
-}
-
-.rawExceptionStackTrace {
-    font-size: 1.2em;
-}
-
-.rawExceptionBlock {
-  ");
-            WriteLiteral(@"  border-top: 1px #ddd solid;
-    border-bottom: 1px #ddd solid;
-}
-
-.showRawExceptionContainer {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-
-.expandCollapseButton {
-    cursor: pointer;
-    float: left;
-    height: 16px;
-    width: 16px;
-    font-size: 10px;
-    position: absolute;
-    left: 10px;
-    background-color: #eee;
-    padding: 0;
-    border: 0;
-    margin: 0;
-}
-
-        </style>
-    </head>
-    <body>
-        <h1>");
-#line 226 "ErrorPage.cshtml"
-       Write(Resources.ErrorPageHtml_UnhandledException);
-
-#line default
-#line hidden
-            WriteLiteral("</h1>\r\n");
-#line 227 "ErrorPage.cshtml"
-        
-
-#line default
-#line hidden
-
-#line 227 "ErrorPage.cshtml"
-         foreach (var errorDetail in Model.ErrorDetails)
-        {
-
-#line default
-#line hidden
-
-            WriteLiteral("            <div class=\"titleerror\">");
-#line 229 "ErrorPage.cshtml"
-                               Write(errorDetail.Error.GetType().Name);
-
-#line default
-#line hidden
-            WriteLiteral(": ");
-#line 229 "ErrorPage.cshtml"
-                                                                          Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); 
-
-#line default
-#line hidden
-
-            WriteLiteral("</div>\r\n");
-#line 230 "ErrorPage.cshtml"
-            
-
-#line default
-#line hidden
-
-#line 230 "ErrorPage.cshtml"
-              
-                var firstFrame = errorDetail.StackFrames.FirstOrDefault();
-                if (firstFrame != null)
-                {
-                    location = firstFrame.Function;
-                }
-            
-
-#line default
-#line hidden
-
-#line 236 "ErrorPage.cshtml"
-             
-            if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
-            {
-
-#line default
-#line hidden
-
-            WriteLiteral("                <p class=\"location\">");
-#line 239 "ErrorPage.cshtml"
-                               Write(location);
-
-#line default
-#line hidden
-            WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 4844, "\"", 4868, 1);
-#line 239 "ErrorPage.cshtml"
-WriteAttributeValue("", 4852, firstFrame.File, 4852, 16, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(">");
-#line 239 "ErrorPage.cshtml"
-                                                                           Write(System.IO.Path.GetFileName(firstFrame.File));
-
-#line default
-#line hidden
-            WriteLiteral("</code>, line ");
-#line 239 "ErrorPage.cshtml"
-                                                                                                                                     Write(firstFrame.Line);
-
-#line default
-#line hidden
-            WriteLiteral("</p>\r\n");
-#line 240 "ErrorPage.cshtml"
-            }
-            else if (!string.IsNullOrEmpty(location))
-            {
-
-#line default
-#line hidden
-
-            WriteLiteral("                <p class=\"location\">");
-#line 243 "ErrorPage.cshtml"
-                               Write(location);
-
-#line default
-#line hidden
-            WriteLiteral("</p>\r\n");
-#line 244 "ErrorPage.cshtml"
-            }
-            else
-            {
-
-#line default
-#line hidden
-
-            WriteLiteral("                <p class=\"location\">");
-#line 247 "ErrorPage.cshtml"
-                               Write(Resources.ErrorPageHtml_UnknownLocation);
-
-#line default
-#line hidden
-            WriteLiteral("</p>\r\n");
-#line 248 "ErrorPage.cshtml"
-            }
-
-            var reflectionTypeLoadException = errorDetail.Error as ReflectionTypeLoadException;
-            if (reflectionTypeLoadException != null)
-            {
-                if (reflectionTypeLoadException.LoaderExceptions.Length > 0)
-                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                    <h3>Loader Exceptions:</h3>\r\n                    <ul>\r\n");
-#line 257 "ErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 257 "ErrorPage.cshtml"
-                         foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
-                        {
-
-#line default
-#line hidden
-
-            WriteLiteral("                            <li>");
-#line 259 "ErrorPage.cshtml"
-                           Write(ex.Message);
-
-#line default
-#line hidden
-            WriteLiteral("</li>\r\n");
-#line 260 "ErrorPage.cshtml"
-                        }
-
-#line default
-#line hidden
-
-            WriteLiteral("                    </ul>\r\n");
-#line 262 "ErrorPage.cshtml"
-                }
-            }
-        }
-
-#line default
-#line hidden
-
-            WriteLiteral("        <div id=\"stackpage\" class=\"page\">\r\n            <ul>\r\n");
-#line 267 "ErrorPage.cshtml"
-                
-
-#line default
-#line hidden
-
-#line 267 "ErrorPage.cshtml"
-                  
-                    var exceptionCount = 0;
-                    var stackFrameCount = 0;
-                    var exceptionDetailId = "";
-                    var frameId = "";
-                
-
-#line default
-#line hidden
-
-            WriteLiteral("                ");
-#line 273 "ErrorPage.cshtml"
-                 foreach (var errorDetail in Model.ErrorDetails)
-                {
-                    
-
-#line default
-#line hidden
-
-#line 275 "ErrorPage.cshtml"
-                      
-                        exceptionCount++;
-                        exceptionDetailId = "exceptionDetail" + exceptionCount;
-                    
-
-#line default
-#line hidden
-
-#line 278 "ErrorPage.cshtml"
-                     
-
-#line default
-#line hidden
-
-            WriteLiteral("                    <li>\r\n                        <h2 class=\"stackerror\">");
-#line 280 "ErrorPage.cshtml"
-                                          Write(errorDetail.Error.GetType().Name);
-
-#line default
-#line hidden
-            WriteLiteral(": ");
-#line 280 "ErrorPage.cshtml"
-                                                                             Write(errorDetail.Error.Message);
-
-#line default
-#line hidden
-            WriteLiteral("</h2>\r\n                        <ul>\r\n");
-#line 282 "ErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 282 "ErrorPage.cshtml"
-                         foreach (var frame in errorDetail.StackFrames)
-                        {
-                            
-
-#line default
-#line hidden
-
-#line 284 "ErrorPage.cshtml"
-                              
-                                stackFrameCount++;
-                                frameId = "frame" + stackFrameCount;
-                            
-
-#line default
-#line hidden
-
-#line 287 "ErrorPage.cshtml"
-                             
-
-#line default
-#line hidden
-
-            WriteLiteral("                            <li class=\"frame\"");
-            BeginWriteAttribute("id", " id=\"", 6874, "\"", 6887, 1);
-#line 288 "ErrorPage.cshtml"
-WriteAttributeValue("", 6879, frameId, 6879, 8, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(">\r\n");
-#line 289 "ErrorPage.cshtml"
-                                
-
-#line default
-#line hidden
-
-#line 289 "ErrorPage.cshtml"
-                                 if (string.IsNullOrEmpty(frame.File))
-                                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                    <h3>");
-#line 291 "ErrorPage.cshtml"
-                                   Write(frame.Function);
-
-#line default
-#line hidden
-            WriteLiteral("</h3>\r\n");
-#line 292 "ErrorPage.cshtml"
-                                }
-                                else
-                                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                    <h3>");
-#line 295 "ErrorPage.cshtml"
-                                   Write(frame.Function);
-
-#line default
-#line hidden
-            WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 7232, "\"", 7251, 1);
-#line 295 "ErrorPage.cshtml"
-WriteAttributeValue("", 7240, frame.File, 7240, 11, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(">");
-#line 295 "ErrorPage.cshtml"
-                                                                                Write(System.IO.Path.GetFileName(frame.File));
-
-#line default
-#line hidden
-            WriteLiteral("</code></h3>\r\n");
-#line 296 "ErrorPage.cshtml"
-                                }
-
-#line default
-#line hidden
-
-            WriteLiteral("\r\n");
-#line 298 "ErrorPage.cshtml"
-                                
-
-#line default
-#line hidden
-
-#line 298 "ErrorPage.cshtml"
-                                 if (frame.Line != 0 && frame.ContextCode.Any())
-                                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                    <button class=\"expandCollapseButton\" data-frameId=\"");
-#line 300 "ErrorPage.cshtml"
-                                                                                  Write(frameId);
-
-#line default
-#line hidden
-            WriteLiteral("\">+</button>\r\n                                    <div class=\"source\">\r\n");
-#line 302 "ErrorPage.cshtml"
-                                        
-
-#line default
-#line hidden
-
-#line 302 "ErrorPage.cshtml"
-                                         if (frame.PreContextCode.Any())
-                                        {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\"", 7791, "\"", 7820, 1);
-#line 304 "ErrorPage.cshtml"
-WriteAttributeValue("", 7799, frame.PreContextLine, 7799, 21, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(" class=\"collapsible\">\r\n");
-#line 305 "ErrorPage.cshtml"
-                                                
-
-#line default
-#line hidden
-
-#line 305 "ErrorPage.cshtml"
-                                                 foreach (var line in frame.PreContextCode)
-                                                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                                    <li><span>");
-#line 307 "ErrorPage.cshtml"
-                                                         Write(line);
-
-#line default
-#line hidden
-            WriteLiteral("</span></li>\r\n");
-#line 308 "ErrorPage.cshtml"
-                                                }
-
-#line default
-#line hidden
-
-            WriteLiteral("                                            </ol>\r\n");
-#line 310 "ErrorPage.cshtml"
-                                        }
-
-#line default
-#line hidden
-
-            WriteLiteral("\r\n                                        <ol");
-            BeginWriteAttribute("start", " start=\"", 8259, "\"", 8278, 1);
-#line 312 "ErrorPage.cshtml"
-WriteAttributeValue("", 8267, frame.Line, 8267, 11, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(" class=\"highlight\">\r\n");
-#line 313 "ErrorPage.cshtml"
-                                            
-
-#line default
-#line hidden
-
-#line 313 "ErrorPage.cshtml"
-                                             foreach (var line in frame.ContextCode)
-                                            {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                                <li><span>");
-#line 315 "ErrorPage.cshtml"
-                                                     Write(line);
-
-#line default
-#line hidden
-            WriteLiteral("</span></li>\r\n");
-#line 316 "ErrorPage.cshtml"
-                                            }
-
-#line default
-#line hidden
-
-            WriteLiteral("                                        </ol>\r\n\r\n");
-#line 319 "ErrorPage.cshtml"
-                                        
-
-#line default
-#line hidden
-
-#line 319 "ErrorPage.cshtml"
-                                         if (frame.PostContextCode.Any())
-                                        {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\'", 8771, "\'", 8796, 1);
-#line 321 "ErrorPage.cshtml"
-WriteAttributeValue("", 8779, frame.Line + 1, 8779, 17, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(" class=\"collapsible\">\r\n");
-#line 322 "ErrorPage.cshtml"
-                                                
-
-#line default
-#line hidden
-
-#line 322 "ErrorPage.cshtml"
-                                                 foreach (var line in frame.PostContextCode)
-                                                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                                    <li><span>");
-#line 324 "ErrorPage.cshtml"
-                                                         Write(line);
-
-#line default
-#line hidden
-            WriteLiteral("</span></li>\r\n");
-#line 325 "ErrorPage.cshtml"
-                                                }
-
-#line default
-#line hidden
-
-            WriteLiteral("                                            </ol>\r\n");
-#line 327 "ErrorPage.cshtml"
-                                        }
-
-#line default
-#line hidden
-
-            WriteLiteral("                                    </div>\r\n");
-#line 329 "ErrorPage.cshtml"
-                                }
-
-#line default
-#line hidden
-
-            WriteLiteral("                            </li>\r\n");
-#line 331 "ErrorPage.cshtml"
-                        }
-
-#line default
-#line hidden
-
-            WriteLiteral(@"                        </ul>
-                    </li>
-                    <li>
-                        <br/>
-                        <div class=""rawExceptionBlock"">
-                            <div class=""showRawExceptionContainer"">
-                                <button class=""showRawException"" data-exceptionDetailId=""");
-#line 338 "ErrorPage.cshtml"
-                                                                                    Write(exceptionDetailId);
-
-#line default
-#line hidden
-            WriteLiteral("\">Show raw exception details</button>\r\n                            </div>\r\n                            <div");
-            BeginWriteAttribute("id", " id=\"", 9787, "\"", 9810, 1);
-#line 340 "ErrorPage.cshtml"
-WriteAttributeValue("", 9792, exceptionDetailId, 9792, 18, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(" class=\"rawExceptionDetails\">\r\n                                <pre class=\"rawExceptionStackTrace\">");
-#line 341 "ErrorPage.cshtml"
-                                                               Write(errorDetail.Error.ToString());
-
-#line default
-#line hidden
-            WriteLiteral("</pre>\r\n                            </div>\r\n                        </div>\r\n                    </li>\r\n");
-#line 345 "ErrorPage.cshtml"
-                }
-
-#line default
-#line hidden
-
-            WriteLiteral("            </ul>\r\n        </div>\r\n        <footer>\r\n            ");
-#line 349 "ErrorPage.cshtml"
-       Write(Model.RuntimeDisplayName);
-
-#line default
-#line hidden
-            WriteLiteral(" ");
-#line 349 "ErrorPage.cshtml"
-                                 Write(Model.RuntimeArchitecture);
-
-#line default
-#line hidden
-            WriteLiteral(" v");
-#line 349 "ErrorPage.cshtml"
-                                                              Write(Model.ClrVersion);
-
-#line default
-#line hidden
-            WriteLiteral(" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version ");
-#line 349 "ErrorPage.cshtml"
-                                                                                                                                                           Write(Model.CurrentAssemblyVesion);
-
-#line default
-#line hidden
-            WriteLiteral(" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; ");
-#line 349 "ErrorPage.cshtml"
-                                                                                                                                                                                                                              Write(Model.OperatingSystemDescription);
-
-#line default
-#line hidden
-            WriteLiteral(@" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=""http://go.microsoft.com/fwlink/?LinkId=517394"">Need help?</a>
-        </footer>
-        <script>
-            //<!--
-            (function (window, undefined) {
-    ""use strict"";
-
-    function ns(selector, element) {
-        return new NodeCollection(selector, element);
-    }
-
-    function NodeCollection(selector, element) {
-        this.items = [];
-        element = element || window.document;
-
-        var nodeList;
-
-        if (typeof (selector) === ""string"") {
-            nodeList = element.querySelectorAll(selector);
-            for (var i = 0, l = nodeList.length; i < l; i++) {
-                this.items.push(nodeList.item(i));
-            }
-        }
-    }
-
-    NodeCollection.prototype = {
-        each: function (callback) {
-            for (var i = 0, l = this.items.length; i < l; i++) {
-                callback(this.items[i], i);
-            }
-            return this;
-        },
-
-        children: function (selector) {
-   ");
-            WriteLiteral(@"         var children = [];
-
-            this.each(function (el) {
-                children = children.concat(ns(selector, el).items);
-            });
-
-            return ns(children);
-        },
-
-        hide: function () {
-            this.each(function (el) {
-                el.style.display = ""none"";
-            });
-
-            return this;
-        },
-
-        toggle: function () {
-            this.each(function (el) {
-                el.style.display = el.style.display === ""none"" ? """" : ""none"";
-            });
-
-            return this;
-        },
-
-        show: function () {
-            this.each(function (el) {
-                el.style.display = """";
-            });
-
-            return this;
-        },
-
-        addClass: function (className) {
-            this.each(function (el) {
-                var existingClassName = el.className,
-                    classNames;
-                if (!existingClassName) {
-                    el.className = className;
-             ");
-            WriteLiteral(@"   } else {
-                    classNames = existingClassName.split("" "");
-                    if (classNames.indexOf(className) < 0) {
-                        el.className = existingClassName + "" "" + className;
-                    }
-                }
-            });
-
-            return this;
-        },
-
-        removeClass: function (className) {
-            this.each(function (el) {
-                var existingClassName = el.className,
-                    classNames, index;
-                if (existingClassName === className) {
-                    el.className = """";
-                } else if (existingClassName) {
-                    classNames = existingClassName.split("" "");
-                    index = classNames.indexOf(className);
-                    if (index > 0) {
-                        classNames.splice(index, 1);
-                        el.className = classNames.join("" "");
-                    }
-                }
-            });
-
-            return this;
-        },
-
-    ");
-            WriteLiteral(@"    attr: function (name) {
-            if (this.items.length === 0) {
-                return null;
-            }
-
-            return this.items[0].getAttribute(name);
-        },
-
-        on: function (eventName, handler) {
-            this.each(function (el, idx) {
-                var callback = function (e) {
-                    e = e || window.event;
-                    if (!e.which && e.keyCode) {
-                        e.which = e.keyCode; // Normalize IE8 key events
-                    }
-                    handler.apply(el, [e]);
-                };
-
-                if (el.addEventListener) { // DOM Events
-                    el.addEventListener(eventName, callback, false);
-                } else if (el.attachEvent) { // IE8 events
-                    el.attachEvent(""on"" + eventName, callback);
-                } else {
-                    el[""on"" + type] = callback;
-                }
-            });
-
-            return this;
-        },
-
-        click: function (handler) {
");
-            WriteLiteral(@"
-            return this.on(""click"", handler);
-        },
-
-        keypress: function (handler) {
-            return this.on(""keypress"", handler);
-        }
-    };
-
-    function frame(el) {
-        ns("".source .collapsible"", el).toggle();
-    }
-
-    function expandCollapseButton(el) {
-        var frameId = el.getAttribute(""data-frameId"");
-        frame(document.getElementById(frameId));
-        if (el.innerText === ""+"") {
-            el.innerText = ""-"";
-        }
-        else {
-            el.innerText = ""+"";
-        }
-    }
-
-    function tab(el) {
-        var unselected = ns(""#header .selected"").removeClass(""selected"").attr(""id"");
-        var selected = ns(""#"" + el.id).addClass(""selected"").attr(""id"");
-
-        ns(""#"" + unselected + ""page"").hide();
-        ns(""#"" + selected + ""page"").show();
-    }
-
-    ns("".rawExceptionDetails"").hide();
-    ns("".collapsible"").hide();
-    ns("".page"").hide();
-    ns(""#stackpage"").show();
-
-    ns("".expandCollapseButton"")
-        .click(functi");
-            WriteLiteral(@"on () {
-            expandCollapseButton(this);
-        })
-        .keypress(function (e) {
-            if (e.which === 13) {
-                expandCollapseButton(this);
-            }
-        });
-
-    ns(""#header li"")
-        .click(function () {
-            tab(this);
-        })
-        .keypress(function (e) {
-            if (e.which === 13) {
-                tab(this);
-            }
-        });
-
-    ns("".showRawException"")
-        .click(function () {
-            var exceptionDetailId = this.getAttribute(""data-exceptionDetailId"");
-            ns(""#"" + exceptionDetailId).toggle();
-        });
-})(window);
-            //-->
-        </script>
-</body>
-</html>
-");
-        }
-        #pragma warning restore 1998
-    }
-}
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.cshtml b/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.cshtml
deleted file mode 100644
index 8f8360c565..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.cshtml
+++ /dev/null
@@ -1,162 +0,0 @@
-@using System
-@using System.Globalization
-@using System.Linq
-@using System.Net
-@using System.Reflection
-@using Microsoft.AspNetCore.Hosting.Views
-
-@functions
-{
-    public ErrorPage(ErrorPageModel model)
-    {
-        Model = model;
-    }
-
-    public ErrorPageModel Model { get; set; }
-}
-@{
-    Response.ContentType = "text/html; charset=utf-8";
-    var location = string.Empty;
-}
-<!DOCTYPE html>
-<html lang="@CultureInfo.CurrentUICulture.TwoLetterISOLanguageName" xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta charset="utf-8" />
-        <title>@Resources.ErrorPageHtml_Title</title>
-        <style>
-            <%$ include: ErrorPage.css %>
-        </style>
-    </head>
-    <body>
-        <h1>@Resources.ErrorPageHtml_UnhandledException</h1>
-        @foreach (var errorDetail in Model.ErrorDetails)
-        {
-            <div class="titleerror">@errorDetail.Error.GetType().Name: @{ Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); }</div>
-            @{
-                var firstFrame = errorDetail.StackFrames.FirstOrDefault();
-                if (firstFrame != null)
-                {
-                    location = firstFrame.Function;
-                }
-            }
-            if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
-            {
-                <p class="location">@location in <code title="@firstFrame.File">@System.IO.Path.GetFileName(firstFrame.File)</code>, line @firstFrame.Line</p>
-            }
-            else if (!string.IsNullOrEmpty(location))
-            {
-                <p class="location">@location</p>
-            }
-            else
-            {
-                <p class="location">@Resources.ErrorPageHtml_UnknownLocation</p>
-            }
-
-            var reflectionTypeLoadException = errorDetail.Error as ReflectionTypeLoadException;
-            if (reflectionTypeLoadException != null)
-            {
-                if (reflectionTypeLoadException.LoaderExceptions.Length > 0)
-                {
-                    <h3>Loader Exceptions:</h3>
-                    <ul>
-                        @foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
-                        {
-                            <li>@ex.Message</li>
-                        }
-                    </ul>
-                }
-            }
-        }
-        <div id="stackpage" class="page">
-            <ul>
-                @{
-                    var exceptionCount = 0;
-                    var stackFrameCount = 0;
-                    var exceptionDetailId = "";
-                    var frameId = "";
-                }
-                @foreach (var errorDetail in Model.ErrorDetails)
-                {
-                    @{
-                        exceptionCount++;
-                        exceptionDetailId = "exceptionDetail" + exceptionCount;
-                    }
-                    <li>
-                        <h2 class="stackerror">@errorDetail.Error.GetType().Name: @errorDetail.Error.Message</h2>
-                        <ul>
-                        @foreach (var frame in errorDetail.StackFrames)
-                        {
-                            @{
-                                stackFrameCount++;
-                                frameId = "frame" + stackFrameCount;
-                            }
-                            <li class="frame" id="@frameId">
-                                @if (string.IsNullOrEmpty(frame.File))
-                                {
-                                    <h3>@frame.Function</h3>
-                                }
-                                else
-                                {
-                                    <h3>@frame.Function in <code title="@frame.File">@System.IO.Path.GetFileName(frame.File)</code></h3>
-                                }
-
-                                @if (frame.Line != 0 && frame.ContextCode.Any())
-                                {
-                                    <button class="expandCollapseButton" data-frameId="@frameId">+</button>
-                                    <div class="source">
-                                        @if (frame.PreContextCode.Any())
-                                        {
-                                            <ol start="@frame.PreContextLine" class="collapsible">
-                                                @foreach (var line in frame.PreContextCode)
-                                                {
-                                                    <li><span>@line</span></li>
-                                                }
-                                            </ol>
-                                        }
-
-                                        <ol start="@frame.Line" class="highlight">
-                                            @foreach (var line in frame.ContextCode)
-                                            {
-                                                <li><span>@line</span></li>
-                                            }
-                                        </ol>
-
-                                        @if (frame.PostContextCode.Any())
-                                        {
-                                            <ol start='@(frame.Line + 1)' class="collapsible">
-                                                @foreach (var line in frame.PostContextCode)
-                                                {
-                                                    <li><span>@line</span></li>
-                                                }
-                                            </ol>
-                                        }
-                                    </div>
-                                }
-                            </li>
-                        }
-                        </ul>
-                    </li>
-                    <li>
-                        <br/>
-                        <div class="rawExceptionBlock">
-                            <div class="showRawExceptionContainer">
-                                <button class="showRawException" data-exceptionDetailId="@exceptionDetailId">Show raw exception details</button>
-                            </div>
-                            <div id="@exceptionDetailId" class="rawExceptionDetails">
-                                <pre class="rawExceptionStackTrace">@errorDetail.Error.ToString()</pre>
-                            </div>
-                        </div>
-                    </li>
-                }
-            </ul>
-        </div>
-        <footer>
-            @Model.RuntimeDisplayName @Model.RuntimeArchitecture v@(Model.ClrVersion) &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version @Model.CurrentAssemblyVesion &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; @Model.OperatingSystemDescription &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="http://go.microsoft.com/fwlink/?LinkId=517394">Need help?</a>
-        </footer>
-        <script>
-            //<!--
-            <%$ include: ErrorPage.js %>
-            //-->
-        </script>
-</body>
-</html>
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.css b/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.css
deleted file mode 100644
index 4d3287c12d..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.css
+++ /dev/null
@@ -1,195 +0,0 @@
-body {
-    font-family: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;
-    font-size: .813em;
-    color: #222;
-}
-
-h1, h2, h3, h4, h5 {
-    /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/
-    font-weight: 100;
-}
-
-h1 {
-    color: #44525e;
-    margin: 15px 0 15px 0;
-}
-
-h2 {
-    margin: 10px 5px 0 0;
-}
-
-h3 {
-    color: #363636;
-    margin: 5px 5px 0 0;
-}
-
-code {
-    font-family: Consolas, "Courier New", courier, monospace;
-}
-
-body .titleerror {
-    padding: 3px 3px 6px 3px;
-    display: block;
-    font-size: 1.5em;
-    font-weight: 100;
-}
-
-body .location {
-    margin: 3px 0 10px 30px;
-}
-
-#header {
-    font-size: 18px;
-    padding: 15px 0;
-    border-top: 1px #ddd solid;
-    border-bottom: 1px #ddd solid;
-    margin-bottom: 0;
-}
-
-    #header li {
-        display: inline;
-        margin: 5px;
-        padding: 5px;
-        color: #a0a0a0;
-        cursor: pointer;
-    }
-
-    #header .selected {
-        background: #44c5f2;
-        color: #fff;
-    }
-
-#stackpage ul {
-    list-style: none;
-    padding-left: 0;
-    margin: 0;
-    /*border-bottom: 1px #ddd solid;*/
-}
-
-#stackpage .details {
-    font-size: 1.2em;
-    padding: 3px;
-    color: #000;
-}
-
-#stackpage .stackerror {
-    padding: 5px;
-    border-bottom: 1px #ddd solid;
-}
-
-
-#stackpage .frame {
-    padding: 0;
-    margin: 0 0 0 30px;
-}
-
-    #stackpage .frame h3 {
-        padding: 2px;
-        margin: 0;
-    }
-
-#stackpage .source {
-    padding: 0 0 0 30px;
-}
-
-    #stackpage .source ol li {
-        font-family: Consolas, "Courier New", courier, monospace;
-        white-space: pre;
-        background-color: #fbfbfb;
-    }
-
-#stackpage .frame .source .highlight li span {
-    color: #FF0000;
-}
-
-#stackpage .source ol.collapsible li {
-    color: #888;
-}
-
-    #stackpage .source ol.collapsible li span {
-        color: #606060;
-    }
-
-.page table {
-    border-collapse: separate;
-    border-spacing: 0;
-    margin: 0 0 20px;
-}
-
-.page th {
-    vertical-align: bottom;
-    padding: 10px 5px 5px 5px;
-    font-weight: 400;
-    color: #a0a0a0;
-    text-align: left;
-}
-
-.page td {
-    padding: 3px 10px;
-}
-
-.page th, .page td {
-    border-right: 1px #ddd solid;
-    border-bottom: 1px #ddd solid;
-    border-left: 1px transparent solid;
-    border-top: 1px transparent solid;
-    box-sizing: border-box;
-}
-
-    .page th:last-child, .page td:last-child {
-        border-right: 1px transparent solid;
-    }
-
-.page .length {
-    text-align: right;
-}
-
-a {
-    color: #1ba1e2;
-    text-decoration: none;
-}
-
-    a:hover {
-        color: #13709e;
-        text-decoration: underline;
-    }
-
-.showRawException {
-    cursor: pointer;
-    color: #44c5f2;
-    background-color: transparent;
-    font-size: 1.2em;
-    text-align: left;
-    text-decoration: none;
-    display: inline-block;
-    border: 0;
-    padding: 0;
-}
-
-.rawExceptionStackTrace {
-    font-size: 1.2em;
-}
-
-.rawExceptionBlock {
-    border-top: 1px #ddd solid;
-    border-bottom: 1px #ddd solid;
-}
-
-.showRawExceptionContainer {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-
-.expandCollapseButton {
-    cursor: pointer;
-    float: left;
-    height: 16px;
-    width: 16px;
-    font-size: 10px;
-    position: absolute;
-    left: 10px;
-    background-color: #eee;
-    padding: 0;
-    border: 0;
-    margin: 0;
-}
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.js b/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.js
deleted file mode 100644
index 3925cfd2f2..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPage.js
+++ /dev/null
@@ -1,192 +0,0 @@
-(function (window, undefined) {
-    "use strict";
-
-    function ns(selector, element) {
-        return new NodeCollection(selector, element);
-    }
-
-    function NodeCollection(selector, element) {
-        this.items = [];
-        element = element || window.document;
-
-        var nodeList;
-
-        if (typeof (selector) === "string") {
-            nodeList = element.querySelectorAll(selector);
-            for (var i = 0, l = nodeList.length; i < l; i++) {
-                this.items.push(nodeList.item(i));
-            }
-        }
-    }
-
-    NodeCollection.prototype = {
-        each: function (callback) {
-            for (var i = 0, l = this.items.length; i < l; i++) {
-                callback(this.items[i], i);
-            }
-            return this;
-        },
-
-        children: function (selector) {
-            var children = [];
-
-            this.each(function (el) {
-                children = children.concat(ns(selector, el).items);
-            });
-
-            return ns(children);
-        },
-
-        hide: function () {
-            this.each(function (el) {
-                el.style.display = "none";
-            });
-
-            return this;
-        },
-
-        toggle: function () {
-            this.each(function (el) {
-                el.style.display = el.style.display === "none" ? "" : "none";
-            });
-
-            return this;
-        },
-
-        show: function () {
-            this.each(function (el) {
-                el.style.display = "";
-            });
-
-            return this;
-        },
-
-        addClass: function (className) {
-            this.each(function (el) {
-                var existingClassName = el.className,
-                    classNames;
-                if (!existingClassName) {
-                    el.className = className;
-                } else {
-                    classNames = existingClassName.split(" ");
-                    if (classNames.indexOf(className) < 0) {
-                        el.className = existingClassName + " " + className;
-                    }
-                }
-            });
-
-            return this;
-        },
-
-        removeClass: function (className) {
-            this.each(function (el) {
-                var existingClassName = el.className,
-                    classNames, index;
-                if (existingClassName === className) {
-                    el.className = "";
-                } else if (existingClassName) {
-                    classNames = existingClassName.split(" ");
-                    index = classNames.indexOf(className);
-                    if (index > 0) {
-                        classNames.splice(index, 1);
-                        el.className = classNames.join(" ");
-                    }
-                }
-            });
-
-            return this;
-        },
-
-        attr: function (name) {
-            if (this.items.length === 0) {
-                return null;
-            }
-
-            return this.items[0].getAttribute(name);
-        },
-
-        on: function (eventName, handler) {
-            this.each(function (el, idx) {
-                var callback = function (e) {
-                    e = e || window.event;
-                    if (!e.which && e.keyCode) {
-                        e.which = e.keyCode; // Normalize IE8 key events
-                    }
-                    handler.apply(el, [e]);
-                };
-
-                if (el.addEventListener) { // DOM Events
-                    el.addEventListener(eventName, callback, false);
-                } else if (el.attachEvent) { // IE8 events
-                    el.attachEvent("on" + eventName, callback);
-                } else {
-                    el["on" + type] = callback;
-                }
-            });
-
-            return this;
-        },
-
-        click: function (handler) {
-            return this.on("click", handler);
-        },
-
-        keypress: function (handler) {
-            return this.on("keypress", handler);
-        }
-    };
-
-    function frame(el) {
-        ns(".source .collapsible", el).toggle();
-    }
-
-    function expandCollapseButton(el) {
-        var frameId = el.getAttribute("data-frameId");
-        frame(document.getElementById(frameId));
-        if (el.innerText === "+") {
-            el.innerText = "-";
-        }
-        else {
-            el.innerText = "+";
-        }
-    }
-
-    function tab(el) {
-        var unselected = ns("#header .selected").removeClass("selected").attr("id");
-        var selected = ns("#" + el.id).addClass("selected").attr("id");
-
-        ns("#" + unselected + "page").hide();
-        ns("#" + selected + "page").show();
-    }
-
-    ns(".rawExceptionDetails").hide();
-    ns(".collapsible").hide();
-    ns(".page").hide();
-    ns("#stackpage").show();
-
-    ns(".expandCollapseButton")
-        .click(function () {
-            expandCollapseButton(this);
-        })
-        .keypress(function (e) {
-            if (e.which === 13) {
-                expandCollapseButton(this);
-            }
-        });
-
-    ns("#header li")
-        .click(function () {
-            tab(this);
-        })
-        .keypress(function (e) {
-            if (e.which === 13) {
-                tab(this);
-            }
-        });
-
-    ns(".showRawException")
-        .click(function () {
-            var exceptionDetailId = this.getAttribute("data-exceptionDetailId");
-            ns("#" + exceptionDetailId).toggle();
-        });
-})(window);
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPageModel.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPageModel.cs
deleted file mode 100644
index b0a9f0354a..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Startup/ExceptionPage/Views/ErrorPageModel.cs
+++ /dev/null
@@ -1,29 +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.Collections.Generic;
-using Microsoft.Extensions.StackTrace.Sources;
-
-namespace Microsoft.AspNetCore.Hosting.Views
-{
-    /// <summary>
-    /// Holds data to be displayed on the error page.
-    /// </summary>
-    internal class ErrorPageModel
-    {
-        /// <summary>
-        /// Detailed information about each exception in the stack.
-        /// </summary>
-        public IEnumerable<ExceptionDetails> ErrorDetails { get; set; }
-
-        public string RuntimeDisplayName { get; set; }
-
-        public string RuntimeArchitecture { get; set; }
-
-        public string ClrVersion { get; set; }
-
-        public string CurrentAssemblyVesion { get; set; }
-
-        public string OperatingSystemDescription { get; set; }
-    }
-}
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
new file mode 100644
index 0000000000..7e6123afd8
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
@@ -0,0 +1,329 @@
+// 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 System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.Encodings.Web;
+using Microsoft.Extensions.StackTrace.Sources;
+
+namespace Microsoft.AspNetCore.Hosting
+{
+    internal static class StartupExceptionPage
+    {
+        private static readonly string _errorPageFormatString = GetResourceString("GenericError.html", escapeBraces: true);
+        private static readonly string _errorMessageFormatString = GetResourceString("GenericError_Message.html");
+        private static readonly string _errorExceptionFormatString = GetResourceString("GenericError_Exception.html");
+        private static readonly string _errorFooterFormatString = GetResourceString("GenericError_Footer.html");
+
+        public static byte[] GenerateErrorHtml(bool showDetails, Exception exception)
+        {
+            // Build the message for each error
+            var builder = new StringBuilder();
+            var rawExceptionDetails = new StringBuilder();
+
+            if (!showDetails)
+            {
+                WriteMessage("An error occurred while starting the application.", builder);
+            }
+            else
+            {
+                Debug.Assert(exception != null);
+                var wasSourceCodeWrittenOntoPage = false;
+                var flattenedExceptions = FlattenAndReverseExceptionTree(exception);
+                foreach (var innerEx in flattenedExceptions)
+                {
+                    WriteException(innerEx, builder, ref wasSourceCodeWrittenOntoPage);
+                }
+
+                WriteRawExceptionDetails("Show raw exception details", exception.ToString(), rawExceptionDetails);
+            }
+
+            // Generate the footer
+            var footer = showDetails ? GenerateFooterEncoded() : null;
+
+            // And generate the full markup
+            return Encoding.UTF8.GetBytes(string.Format(CultureInfo.InvariantCulture, _errorPageFormatString, builder, rawExceptionDetails, footer));
+        }
+
+        private static string BuildCodeSnippetDiv(StackFrameInfo frameInfo)
+        {
+            var filename = frameInfo.FilePath;
+            if (!string.IsNullOrEmpty(filename))
+            {
+                int failingLineNumber = frameInfo.LineNumber;
+                if (failingLineNumber >= 1)
+                {
+                    var lines = GetFailingCallSiteInFile(filename, failingLineNumber);
+                    if (lines != null)
+                    {
+                        return @"<div class=""codeSnippet"">"
+                            + @"<div class=""filename""><code>" + HtmlEncodeAndReplaceLineBreaks(filename) + "</code></div>" + Environment.NewLine
+                            + string.Join(Environment.NewLine, lines) + "</div>" + Environment.NewLine;
+                    }
+                }
+            }
+
+            // fallback
+            return null;
+        }
+
+        private static string BuildLineForStackFrame(StackFrameInfo frameInfo)
+        {
+            var builder = new StringBuilder("<pre>");
+            var stackFrame = frameInfo.StackFrame;
+            var method = stackFrame.GetMethod();
+            var displayInfo = frameInfo.MethodDisplayInfo;
+
+            // Special case: no method available
+            if (method == null)
+            {
+                return null;
+            }
+
+            // First, write the type name
+            var type = method.DeclaringType;
+            if (type != null)
+            {
+                // Special-case ExceptionDispatchInfo.Throw()
+                if (type == typeof(ExceptionDispatchInfo) && method.Name == "Throw")
+                {
+                    return @"<pre><span class=""faded"">--- exception rethrown ---</span></pre>";
+                }
+
+                var typeName = displayInfo.DeclaringTypeName;
+                // Separate the namespace component from the type name so that we can format it differently.
+                if (!string.IsNullOrEmpty(typeName) && !string.IsNullOrEmpty(type.Namespace))
+                {
+                    builder.Append($@"<span class=""faded"">at {HtmlEncodeAndReplaceLineBreaks(type.Namespace)}</span>");
+                    typeName = typeName.Substring(type.Namespace.Length);
+                }
+
+                builder.Append(HtmlEncodeAndReplaceLineBreaks(typeName));
+            }
+
+            // Next, write the method signature
+            builder.Append(displayInfo.Name);
+
+            // Build method parameters
+            var methodParameters = "(" + string.Join(", ", displayInfo.Parameters) + ")";
+            builder.Append($@"<span class=""faded"">{HtmlEncodeAndReplaceLineBreaks(methodParameters)}</span>");
+
+            // Do we have source information for this frame?
+            if (stackFrame.GetILOffset() != -1)
+            {
+                var filename = frameInfo.FilePath;
+                if (!string.IsNullOrEmpty(filename))
+                {
+                    builder.AppendFormat(CultureInfo.InvariantCulture, " in {0}:line {1:D}", HtmlEncodeAndReplaceLineBreaks(filename), frameInfo.LineNumber);
+                }
+            }
+
+            // Finish
+            builder.Append("</pre>");
+            return builder.ToString();
+        }
+
+        private static string GetResourceString(string name, bool escapeBraces = false)
+        {
+            // '{' and '}' are special in CSS, so we use "[[[0]]]" instead for {0} (and so on).
+            var assembly = typeof(StartupExceptionPage).GetTypeInfo().Assembly;
+            var resourceName = assembly.GetName().Name + ".compiler.resources." + name;
+            var manifestStream = assembly.GetManifestResourceStream(resourceName);
+            var formatString = new StreamReader(manifestStream, Encoding.UTF8, detectEncodingFromByteOrderMarks: false).ReadToEnd();
+            if (escapeBraces)
+            {
+                formatString = formatString.Replace("{", "{{").Replace("}", "}}").Replace("[[[", "{").Replace("]]]", "}");
+            }
+
+            return formatString;
+        }
+
+        private static List<string> GetFailingCallSiteInFile(string filename, int failedLineNumber)
+        {
+            // We figure out the [first, last] range of lines to read from the file.
+            var firstLineNumber = failedLineNumber - 2;
+            firstLineNumber = Math.Max(1, firstLineNumber);
+            var lastLineNumber = failedLineNumber + 2;
+            lastLineNumber = Math.Max(lastLineNumber, failedLineNumber);
+
+            // Figure out how many characters lastLineNumber will take to print.
+            var lastLineNumberCharLength = lastLineNumber.ToString("D", CultureInfo.InvariantCulture).Length;
+
+            var errorSubContents = new List<string>();
+            var didReadFailingLine = false;
+
+            try
+            {
+                var thisLineNum = 0;
+                foreach (var line in File.ReadLines(filename))
+                {
+                    thisLineNum++;
+
+                    // Are we within the correct range?
+                    if (thisLineNum < firstLineNumber)
+                    {
+                        continue;
+                    }
+                    if (thisLineNum > lastLineNumber)
+                    {
+                        break;
+                    }
+
+                    var encodedLine = HtmlEncodeAndReplaceLineBreaks("Line "
+                        + thisLineNum.ToString("D", CultureInfo.InvariantCulture).PadLeft(lastLineNumberCharLength)
+                        + ":  "
+                        + line);
+
+                    if (thisLineNum == failedLineNumber)
+                    {
+                        didReadFailingLine = true;
+                        errorSubContents.Add(@"<div class=""line error""><code>" + encodedLine + "</code></div>");
+                    }
+                    else
+                    {
+                        errorSubContents.Add(@"<div class=""line""><code>" + encodedLine + "</code></div>");
+                    }
+                }
+            }
+            catch
+            {
+                // If there's an error for any reason, don't show source.
+                return null;
+            }
+
+            return (didReadFailingLine) ? errorSubContents : null;
+        }
+
+        private static string GenerateFooterEncoded()
+        {
+            var runtimeType = HtmlEncodeAndReplaceLineBreaks(Microsoft.Extensions.Internal.RuntimeEnvironment.RuntimeType);
+            var runtimeDisplayName = runtimeType == "CoreCLR" ? ".NET Core" : runtimeType == "CLR" ? ".NET Framework" : "Mono";
+#if NETSTANDARD1_3
+            var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
+            var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();
+            var clrVersion = HtmlEncodeAndReplaceLineBreaks(assemblyVersion);
+#else
+            var clrVersion = HtmlEncodeAndReplaceLineBreaks(Environment.Version.ToString());
+#endif
+            var runtimeArch = HtmlEncodeAndReplaceLineBreaks(RuntimeInformation.ProcessArchitecture.ToString());
+            var currentAssembly = typeof(StartupExceptionPage).GetTypeInfo().Assembly;
+            var currentAssemblyVersion = currentAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
+            currentAssemblyVersion = HtmlEncodeAndReplaceLineBreaks(currentAssemblyVersion);
+
+            var osDescription = HtmlEncodeAndReplaceLineBreaks(RuntimeInformation.OSDescription);
+
+            return string.Format(CultureInfo.InvariantCulture, _errorFooterFormatString, runtimeDisplayName, runtimeArch, clrVersion,
+                currentAssemblyVersion, osDescription);
+        }
+
+        private static string HtmlEncodeAndReplaceLineBreaks(string input)
+        {
+            if (string.IsNullOrEmpty(input))
+            {
+                return string.Empty;
+            }
+
+            // Split on line breaks before passing it through the encoder.
+            // We use the static default encoder since we can't depend on DI in the error handling logic.
+            return string.Join("<br />" + Environment.NewLine,
+                input.Split(new[] { "\r\n" }, StringSplitOptions.None)
+                .SelectMany(s => s.Split(new[] { '\r', '\n' }, StringSplitOptions.None))
+                .Select(HtmlEncoder.Default.Encode));
+        }
+
+        private static void WriteException(Exception ex, StringBuilder builder, ref bool wasFailingCallSiteSourceWritten)
+        {
+            string inlineSourceDiv = null;
+
+            // First, build the stack trace
+            var firstStackFrame = true;
+            var stackTraceBuilder = new StringBuilder();
+            foreach (var frameInfo in StackTraceHelper.GetFrames(ex))
+            {
+                if (!firstStackFrame)
+                {
+                    stackTraceBuilder.Append("<br />");
+                }
+                firstStackFrame = false;
+                var thisFrameLine = BuildLineForStackFrame(frameInfo);
+                stackTraceBuilder.AppendLine(thisFrameLine);
+
+                // Try to include the source code in the error page if we can.
+                if (!wasFailingCallSiteSourceWritten && inlineSourceDiv == null)
+                {
+                    inlineSourceDiv = BuildCodeSnippetDiv(frameInfo);
+                    if (inlineSourceDiv != null)
+                    {
+                        wasFailingCallSiteSourceWritten = true;
+                    }
+                }
+            }
+
+            // Finally, build the rest of the <div>
+            builder.AppendFormat(CultureInfo.InvariantCulture, _errorExceptionFormatString,
+                HtmlEncodeAndReplaceLineBreaks(ex.GetType().FullName),
+                HtmlEncodeAndReplaceLineBreaks(ex.Message),
+                inlineSourceDiv,
+                stackTraceBuilder);
+        }
+
+        private static void WriteRawExceptionDetails(string linkText, string line, StringBuilder rawExceptionDetails)
+        {
+            rawExceptionDetails
+                .AppendLine("<div class=\"rawExceptionBlock\">")
+                .AppendFormat($"    <div><a href=\"#\" onclick=\"javascript: showRawException(); return false;\">{linkText}</a></div>")
+                .AppendLine()
+                .AppendLine("    <div id=\"rawException\">")
+                .Append("        <pre>");
+
+            rawExceptionDetails.AppendLine(line);
+
+            rawExceptionDetails
+                .AppendLine("</pre>")
+                .AppendLine("    </div>")
+                .AppendLine("</div>");
+        }
+
+        private static void WriteMessage(string message, StringBuilder builder)
+        {
+            // Build the <div>
+            builder.AppendFormat(CultureInfo.InvariantCulture, _errorMessageFormatString,
+                HtmlEncodeAndReplaceLineBreaks(message));
+        }
+
+        private static IEnumerable<Exception> FlattenAndReverseExceptionTree(Exception ex)
+        {
+            // ReflectionTypeLoadException is special because the details are in 
+            // the LoaderExceptions property
+            var typeLoadException = ex as ReflectionTypeLoadException;
+            if (typeLoadException != null)
+            {
+                var typeLoadExceptions = new List<Exception>();
+                foreach (var loadException in typeLoadException.LoaderExceptions)
+                {
+                    typeLoadExceptions.AddRange(FlattenAndReverseExceptionTree(loadException));
+                }
+
+                typeLoadExceptions.Add(ex);
+                return typeLoadExceptions;
+            }
+
+            var list = new List<Exception>();
+            while (ex != null)
+            {
+                list.Add(ex);
+                ex = ex.InnerException;
+            }
+            list.Reverse();
+            return list;
+        }
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Hosting/project.json b/src/Microsoft.AspNetCore.Hosting/project.json
index a1960ff935..6998c1891d 100644
--- a/src/Microsoft.AspNetCore.Hosting/project.json
+++ b/src/Microsoft.AspNetCore.Hosting/project.json
@@ -24,17 +24,13 @@
     "Microsoft.AspNetCore.Hosting.Server.Abstractions": "1.1.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Http.Extensions": "1.1.0-*",
+    "Microsoft.Extensions.FileProviders.Physical": "1.1.0-*",
+    "Microsoft.Extensions.Options": "1.1.0-*",
     "Microsoft.Extensions.Configuration": "1.1.0-*",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
-    "Microsoft.Extensions.FileProviders.Physical": "1.1.0-*",
     "Microsoft.Extensions.Logging": "1.1.0-*",
-    "Microsoft.Extensions.Options": "1.1.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.1.0-*",
-    "Microsoft.Extensions.RazorViews.Sources": {
-      "type": "build",
-      "version": "1.1.0-*"
-    },
     "Microsoft.Extensions.RuntimeEnvironment.Sources": {
       "type": "build",
       "version": "1.1.0-*"
@@ -72,8 +68,5 @@
         "System.Reflection.Extensions": "4.0.1-*"
       }
     }
-  },
-  "tools": {
-    "RazorPageGenerator": "1.1.0-*"
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
index c3e44259ed..19906cffbe 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
@@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Hosting
             using (host)
             {
                 host.Start();
-                await AssertResponseContains(server.RequestDelegate, "Message from the LoaderException</div>");
+                await AssertResponseContains(server.RequestDelegate, "Message from the LoaderException</span>");
             }
         }
 
@@ -481,20 +481,20 @@ namespace Microsoft.AspNetCore.Hosting
             var hostingEnv = host.Services.GetService<IHostingEnvironment>();
             Assert.Equal("Microsoft.AspNetCore.Hosting.Tests", hostingEnv.ApplicationName);
         }
-
+        
         [Fact]
         public void Configure_SupportsStaticMethodDelegate()
         {
             var host = new WebHostBuilder()
                 .UseServer(new TestServer())
-                .Configure(StaticConfigureMethod)
+                .Configure(StaticConfigureMethod) 
                 .Build();
 
             var hostingEnv = host.Services.GetService<IHostingEnvironment>();
             Assert.Equal("Microsoft.AspNetCore.Hosting.Tests", hostingEnv.ApplicationName);
         }
 
-        private static void StaticConfigureMethod(IApplicationBuilder app)
+        private static void StaticConfigureMethod(IApplicationBuilder app) 
         { }
 
         private IWebHostBuilder CreateWebHostBuilder()