\r\n");
-#line 29 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 29 "CompilationErrorPage.cshtml"
-
- var stackFrameCount = 0;
- var frameId = "";
-
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 33 "CompilationErrorPage.cshtml"
-
- var fileName = errorDetail.StackFrames.FirstOrDefault()?.File;
- if (!string.IsNullOrEmpty(fileName))
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
");
-#line 37 "CompilationErrorPage.cshtml"
- Write(fileName);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 38 "CompilationErrorPage.cshtml"
- }
-
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 40 "CompilationErrorPage.cshtml"
- if (!string.IsNullOrEmpty(errorDetail.ErrorMessage))
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
");
-#line 42 "CompilationErrorPage.cshtml"
- Write(errorDetail.ErrorMessage);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 43 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n
\r\n");
-#line 46 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 46 "CompilationErrorPage.cshtml"
- foreach (var frame in errorDetail.StackFrames)
- {
-
-
-#line default
-#line hidden
-
-#line 48 "CompilationErrorPage.cshtml"
-
- stackFrameCount++;
- frameId = "frame" + stackFrameCount;
-
-
-#line default
-#line hidden
-
-#line 51 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
- WriteLiteral(" - \r\n");
-#line 53 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 53 "CompilationErrorPage.cshtml"
- if (!string.IsNullOrEmpty(frame.ErrorDetails))
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
");
-#line 55 "CompilationErrorPage.cshtml"
- Write(frame.ErrorDetails);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 56 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("\r\n");
-#line 58 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 58 "CompilationErrorPage.cshtml"
- if (frame.Line != 0 && frame.ContextCode.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n \r\n");
-#line 62 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 62 "CompilationErrorPage.cshtml"
- if (frame.PreContextCode.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 65 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 65 "CompilationErrorPage.cshtml"
- foreach (var line in frame.PreContextCode)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" - ");
-#line 67 "CompilationErrorPage.cshtml"
- Write(line);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 68 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 70 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 72 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 72 "CompilationErrorPage.cshtml"
- foreach (var line in frame.ContextCode)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" - ");
-#line 74 "CompilationErrorPage.cshtml"
- Write(line);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 75 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 77 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 77 "CompilationErrorPage.cshtml"
- if (frame.PostContextCode.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 80 "CompilationErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 80 "CompilationErrorPage.cshtml"
- foreach (var line in frame.PostContextCode)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" - ");
-#line 82 "CompilationErrorPage.cshtml"
- Write(line);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 83 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 85 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 87 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n");
-#line 89 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n
\r\n
\r\n");
-#line 93 "CompilationErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n \r\n\r\n");
- }
- #pragma warning restore 1998
- }
-}
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/CompilationErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/CompilationErrorPage.cshtml
deleted file mode 100644
index 932d677b9c..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/CompilationErrorPage.cshtml
+++ /dev/null
@@ -1,100 +0,0 @@
-@using System
-@using System.Globalization
-@using System.Linq
-@using System.Net
-@using Microsoft.AspNetCore.Diagnostics
-@functions
-{
- public CompilationErrorPageModel Model { get; set; }
-}
-@{
- Response.StatusCode = 500;
- Response.ContentType = "text/html; charset=utf-8";
- Response.ContentLength = null; // Clear any prior Content-Length
-}
-
-
-
-
- @{
- var stackFrameCount = 0;
- var frameId = "";
- }
- @{
- var fileName = errorDetail.StackFrames.FirstOrDefault()?.File;
- if (!string.IsNullOrEmpty(fileName))
- {
-
@fileName
- }
- }
- @if (!string.IsNullOrEmpty(errorDetail.ErrorMessage))
- {
-
@errorDetail.ErrorMessage
- }
-
-
- @foreach (var frame in errorDetail.StackFrames)
- {
- @{
- stackFrameCount++;
- frameId = "frame" + stackFrameCount;
- }
- -
- @if (!string.IsNullOrEmpty(frame.ErrorDetails))
- {
-
@frame.ErrorDetails
- }
-
- @if (frame.Line != 0 && frame.ContextCode.Any())
- {
-
-
- @if (frame.PreContextCode.Any())
- {
-
- @foreach (var line in frame.PreContextCode)
- {
- - @line
- }
-
- }
-
- @foreach (var line in frame.ContextCode)
- {
- - @line
- }
-
- @if (frame.PostContextCode.Any())
- {
-
- @foreach (var line in frame.PostContextCode)
- {
- - @line
- }
-
- }
-
- }
-
- }
-
-
-
- }
-
-
-
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorDetails.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorDetails.cs
deleted file mode 100644
index 323c7eabed..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorDetails.cs
+++ /dev/null
@@ -1,30 +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 System.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Diagnostics.Views
-{
- /// StackFrames { get; set; }
-
- ///
- /// Gets or sets the summary message.
- ///
- public string ErrorMessage { get; set; }
- }
-}
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.cs
deleted file mode 100644
index 0ad27f0f85..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.cs
+++ /dev/null
@@ -1,902 +0,0 @@
-namespace Microsoft.AspNetCore.Diagnostics.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.Diagnostics.Views
-
-#line default
-#line hidden
- ;
-#line 7 "ErrorPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics
-
-#line default
-#line hidden
- ;
- using System.Threading.Tasks;
- [Obsolete("This type is for internal use only and will be removed in a future version.")]
- public class ErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.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()
- {
-#line 17 "ErrorPage.cshtml"
-
- // TODO: Response.ReasonPhrase = "Internal Server Error";
- Response.ContentType = "text/html; charset=utf-8";
- string location = string.Empty;
-
-#line default
-#line hidden
-
- WriteLiteral("\r\n\r\n \r\n \r\n ");
-#line 26 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_Title);
-
-#line default
-#line hidden
- WriteLiteral("\r\n \r\n \r\n \r\n ");
-#line 32 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_UnhandledException);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 33 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 33 "ErrorPage.cshtml"
- foreach (var errorDetail in Model.ErrorDetails)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 35 "ErrorPage.cshtml"
- Write(errorDetail.Error.GetType().Name);
-
-#line default
-#line hidden
- WriteLiteral(": ");
-#line 35 "ErrorPage.cshtml"
- Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message));
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 36 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 36 "ErrorPage.cshtml"
-
- var firstFrame = errorDetail.StackFrames.FirstOrDefault();
- if (firstFrame != null)
- {
- location = firstFrame.Function;
- }
-
-
-#line default
-#line hidden
-
-#line 42 "ErrorPage.cshtml"
-
- if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 45 "ErrorPage.cshtml"
- Write(location);
-
-#line default
-#line hidden
- WriteLiteral(" in ");
-#line 45 "ErrorPage.cshtml"
- Write(System.IO.Path.GetFileName(firstFrame.File));
-
-#line default
-#line hidden
- WriteLiteral(", line ");
-#line 45 "ErrorPage.cshtml"
- Write(firstFrame.Line);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 46 "ErrorPage.cshtml"
- }
- else if (!string.IsNullOrEmpty(location))
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 49 "ErrorPage.cshtml"
- Write(location);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 50 "ErrorPage.cshtml"
- }
- else
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 53 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_UnknownLocation);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 54 "ErrorPage.cshtml"
- }
- }
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 56 "ErrorPage.cshtml"
-
- var reflectionTypeLoadException = Model.ErrorDetails.Last()?.Error as ReflectionTypeLoadException;
- if (reflectionTypeLoadException != null)
- {
- if (reflectionTypeLoadException.LoaderExceptions.Length > 0)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" Loader Exceptions:
\r\n \r\n");
-#line 64 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 64 "ErrorPage.cshtml"
- foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" - ");
-#line 66 "ErrorPage.cshtml"
- Write(ex.Message);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 67 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 69 "ErrorPage.cshtml"
- }
- }
-
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n\r\n \r\n
\r\n");
-#line 89 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 89 "ErrorPage.cshtml"
-
- var exceptionCount = 0;
- var stackFrameCount = 0;
- var exceptionDetailId = "";
- var frameId = "";
-
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 95 "ErrorPage.cshtml"
- foreach (var errorDetail in Model.ErrorDetails)
- {
-
-
-#line default
-#line hidden
-
-#line 97 "ErrorPage.cshtml"
-
- exceptionCount++;
- exceptionDetailId = "exceptionDetail" + exceptionCount;
-
-
-#line default
-#line hidden
-
-#line 100 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
- WriteLiteral(" - \r\n
");
-#line 102 "ErrorPage.cshtml"
- Write(errorDetail.Error.GetType().Name);
-
-#line default
-#line hidden
- WriteLiteral(": ");
-#line 102 "ErrorPage.cshtml"
- Write(errorDetail.Error.Message);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n \r\n");
-#line 104 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 104 "ErrorPage.cshtml"
- foreach (var frame in errorDetail.StackFrames)
- {
-
-
-#line default
-#line hidden
-
-#line 106 "ErrorPage.cshtml"
-
- stackFrameCount++;
- frameId = "frame" + stackFrameCount;
-
-
-#line default
-#line hidden
-
-#line 109 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
- WriteLiteral(" - \r\n");
-#line 111 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 111 "ErrorPage.cshtml"
- if (string.IsNullOrEmpty(frame.File))
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
");
-#line 113 "ErrorPage.cshtml"
- Write(frame.Function);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 114 "ErrorPage.cshtml"
- }
- else
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" ");
-#line 117 "ErrorPage.cshtml"
- Write(frame.Function);
-
-#line default
-#line hidden
- WriteLiteral(" in ");
-#line 117 "ErrorPage.cshtml"
- Write(System.IO.Path.GetFileName(frame.File));
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 118 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("\r\n");
-#line 120 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 120 "ErrorPage.cshtml"
- if (frame.Line != 0 && frame.ContextCode.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n \r\n");
-#line 124 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 124 "ErrorPage.cshtml"
- if (frame.PreContextCode.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 127 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 127 "ErrorPage.cshtml"
- foreach (var line in frame.PreContextCode)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" - ");
-#line 129 "ErrorPage.cshtml"
- Write(line);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 130 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 132 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("\r\n
\r\n");
-#line 135 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 135 "ErrorPage.cshtml"
- foreach (var line in frame.ContextCode)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" - ");
-#line 137 "ErrorPage.cshtml"
- Write(line);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 138 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n\r\n");
-#line 141 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 141 "ErrorPage.cshtml"
- if (frame.PostContextCode.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 144 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 144 "ErrorPage.cshtml"
- foreach (var line in frame.PostContextCode)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" - ");
-#line 146 "ErrorPage.cshtml"
- Write(line);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 147 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 149 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n");
-#line 151 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n");
-#line 153 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral(@"
-
- -
-
-
-
- \r\n
\r\n
\r\n
");
-#line 163 "ErrorPage.cshtml"
- Write(errorDetail.Error.ToString());
-
-#line default
-#line hidden
- WriteLiteral("\r\n
\r\n
\r\n \r\n");
-#line 167 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n
\r\n\r\n \r\n");
-#line 172 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 172 "ErrorPage.cshtml"
- if (Model.Query.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n \r\n \r\n | ");
-#line 177 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_VariableColumn);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n ");
-#line 178 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_ValueColumn);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n
\r\n \r\n \r\n");
-#line 182 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 182 "ErrorPage.cshtml"
- foreach (var kv in Model.Query.OrderBy(kv => kv.Key))
- {
- foreach (var v in kv.Value)
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n | ");
-#line 187 "ErrorPage.cshtml"
- Write(kv.Key);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n ");
-#line 188 "ErrorPage.cshtml"
- Write(v);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n
\r\n");
-#line 190 "ErrorPage.cshtml"
- }
- }
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n
\r\n");
-#line 194 "ErrorPage.cshtml"
- }
- else
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
");
-#line 197 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_NoQueryStringData);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 198 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n\r\n \r\n");
-#line 202 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 202 "ErrorPage.cshtml"
- if (Model.Cookies.Any())
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n \r\n \r\n | ");
-#line 207 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_VariableColumn);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n ");
-#line 208 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_ValueColumn);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n
\r\n \r\n \r\n");
-#line 212 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 212 "ErrorPage.cshtml"
- foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key))
- {
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n | ");
-#line 215 "ErrorPage.cshtml"
- Write(kv.Key);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n ");
-#line 216 "ErrorPage.cshtml"
- Write(kv.Value);
-
-#line default
-#line hidden
- WriteLiteral(" | \r\n
\r\n");
-#line 218 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral(" \r\n
\r\n");
-#line 221 "ErrorPage.cshtml"
- }
- else
- {
-
-#line default
-#line hidden
-
- WriteLiteral("
");
-#line 224 "ErrorPage.cshtml"
- Write(Resources.ErrorPageHtml_NoCookieData);
-
-#line default
-#line hidden
- WriteLiteral("
\r\n");
-#line 225 "ErrorPage.cshtml"
- }
-
-#line default
-#line hidden
-
- WriteLiteral("
\r\n \r\n \r\n \r\n\r\n");
- }
- #pragma warning restore 1998
- }
-}
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.cshtml
deleted file mode 100644
index f4392c63e8..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.cshtml
+++ /dev/null
@@ -1,262 +0,0 @@
-@using System
-@using System.Globalization
-@using System.Linq
-@using System.Net
-@using System.Reflection
-@using Microsoft.AspNetCore.Diagnostics.Views
-@using Microsoft.AspNetCore.Diagnostics
-@functions
-{
- public ErrorPage(ErrorPageModel model)
- {
- Model = model;
- }
-
- public ErrorPageModel Model { get; set; }
-}
-@{
- // TODO: Response.ReasonPhrase = "Internal Server Error";
- Response.ContentType = "text/html; charset=utf-8";
- string location = string.Empty;
-}
-
-
-
-
- @Resources.ErrorPageHtml_Title
-
-
-
- @Resources.ErrorPageHtml_UnhandledException
- @foreach (var errorDetail in Model.ErrorDetails)
- {
- @errorDetail.Error.GetType().Name: @{ Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); }
- @{
- var firstFrame = errorDetail.StackFrames.FirstOrDefault();
- if (firstFrame != null)
- {
- location = firstFrame.Function;
- }
- }
- if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
- {
- @location in @System.IO.Path.GetFileName(firstFrame.File), line @firstFrame.Line
- }
- else if (!string.IsNullOrEmpty(location))
- {
- @location
- }
- else
- {
- @Resources.ErrorPageHtml_UnknownLocation
- }
- }
- @{
- var reflectionTypeLoadException = Model.ErrorDetails.Last()?.Error as ReflectionTypeLoadException;
- if (reflectionTypeLoadException != null)
- {
- if (reflectionTypeLoadException.LoaderExceptions.Length > 0)
- {
- Loader Exceptions:
-
- @foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
- {
- - @ex.Message
- }
-
- }
- }
- }
-
-
-
-
- @{
- var exceptionCount = 0;
- var stackFrameCount = 0;
- var exceptionDetailId = "";
- var frameId = "";
- }
- @foreach (var errorDetail in Model.ErrorDetails)
- {
- @{
- exceptionCount++;
- exceptionDetailId = "exceptionDetail" + exceptionCount;
- }
- -
-
@errorDetail.Error.GetType().Name: @errorDetail.Error.Message
-
- @foreach (var frame in errorDetail.StackFrames)
- {
- @{
- stackFrameCount++;
- frameId = "frame" + stackFrameCount;
- }
- -
- @if (string.IsNullOrEmpty(frame.File))
- {
-
@frame.Function
- }
- else
- {
- @frame.Function in @System.IO.Path.GetFileName(frame.File)
- }
-
- @if (frame.Line != 0 && frame.ContextCode.Any())
- {
-
-
- @if (frame.PreContextCode.Any())
- {
-
- @foreach (var line in frame.PreContextCode)
- {
- - @line
- }
-
- }
-
-
- @foreach (var line in frame.ContextCode)
- {
- - @line
- }
-
-
- @if (frame.PostContextCode.Any())
- {
-
- @foreach (var line in frame.PostContextCode)
- {
- - @line
- }
-
- }
-
- }
-
- }
-
-
- -
-
-
-
-
-
-
-
@errorDetail.Error.ToString()
-
-
-
- }
-
-
-
-
- @if (Model.Query.Any())
- {
-
-
-
- | @Resources.ErrorPageHtml_VariableColumn |
- @Resources.ErrorPageHtml_ValueColumn |
-
-
-
- @foreach (var kv in Model.Query.OrderBy(kv => kv.Key))
- {
- foreach (var v in kv.Value)
- {
-
- | @kv.Key |
- @v |
-
- }
- }
-
-
- }
- else
- {
-
@Resources.ErrorPageHtml_NoQueryStringData
- }
-
-
-
- @if (Model.Cookies.Any())
- {
-
-
-
- | @Resources.ErrorPageHtml_VariableColumn |
- @Resources.ErrorPageHtml_ValueColumn |
-
-
-
- @foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key))
- {
-
- | @kv.Key |
- @kv.Value |
-
- }
-
-
- }
- else
- {
-
@Resources.ErrorPageHtml_NoCookieData
- }
-
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.css b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.css
deleted file mode 100644
index 4d3287c12d..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/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.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.js b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPage.js
deleted file mode 100644
index 3925cfd2f2..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/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.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPageModel.cs
deleted file mode 100644
index 454c8e010e..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/ErrorPageModel.cs
+++ /dev/null
@@ -1,43 +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 System.Collections.Generic;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-
-namespace Microsoft.AspNetCore.Diagnostics.Views
-{
- ///
- /// Holds data to be displayed on the error page.
- ///
- [Obsolete("This type is for internal use only and will be removed in a future version.")]
- public class ErrorPageModel
- {
- ///
- /// Options for what output to display.
- ///
- public DeveloperExceptionPageOptions Options { get; set; }
-
- ///
- /// Detailed information about each exception in the stack.
- ///
- public IEnumerable ErrorDetails { get; set; }
-
- ///
- /// Parsed query data.
- ///
- public IQueryCollection Query { get; set; }
-
- ///
- /// Request cookies.
- ///
- public IRequestCookieCollection Cookies { get; set; }
-
- ///
- /// Request headers.
- ///
- public IDictionary Headers { get; set; }
- }
-}
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/StackFrame.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/StackFrame.cs
deleted file mode 100644
index 831202a660..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/StackFrame.cs
+++ /dev/null
@@ -1,57 +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 System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Diagnostics.Views
-{
- ///
- /// Detailed exception stack information used to generate a view
- ///
- [Obsolete("This type is for internal use only and will be removed in a future version.")]
- public class StackFrame
- {
- ///
- /// Function containing instruction
- ///
- public string Function { get; set; }
-
- ///
- /// File containing the instruction
- ///
- public string File { get; set; }
-
- ///
- /// The line number of the instruction
- ///
- public int Line { get; set; }
-
- ///
- /// The line preceeding the frame line
- ///
- public int PreContextLine { get; set; }
-
- ///
- /// Lines of code before the actual error line(s).
- ///
- public IEnumerable PreContextCode { get; set; } = Enumerable.Empty();
-
- ///
- /// Line(s) of code responsible for the error.
- ///
- public IEnumerable ContextCode { get; set; } = Enumerable.Empty();
-
- ///
- /// Lines of code after the actual error line(s).
- ///
- public IEnumerable PostContextCode { get; set; } = Enumerable.Empty();
-
- ///
- /// Specific error details for this stack frame.
- ///
- public string ErrorDetails { get; set; }
- }
-}
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/StackFrameInfo.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/StackFrameInfo.cs
deleted file mode 100644
index b4f4819860..0000000000
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/Obsolete/StackFrameInfo.cs
+++ /dev/null
@@ -1,56 +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 System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Diagnostics.Views
-{
- ///
- /// Detailed exception stack information used to generate a view
- ///
- [Obsolete("This type is for internal use only and will be removed in a future version.")]
- public class StackFrameInfo
- {
- ///
- /// Function containing instruction
- ///
- public string Function { get; set; }
-
- ///
- /// File containing the instruction
- ///
- public string File { get; set; }
-
- ///
- /// The line number of the instruction
- ///
- public int Line { get; set; }
-
- ///
- /// The line preceeding the frame line
- ///
- public int PreContextLine { get; set; }
-
- ///
- /// Lines of code before the actual error line(s).
- ///
- public IEnumerable PreContextCode { get; set; } = Enumerable.Empty();
-
- ///
- /// Line(s) of code responsible for the error.
- ///
- public IEnumerable ContextCode { get; set; } = Enumerable.Empty();
-
- ///
- /// Lines of code after the actual error line(s).
- ///
- public IEnumerable PostContextCode { get; set; } = Enumerable.Empty();
-
- ///
- /// Specific error details for this stack frame.
- ///
- public string ErrorDetails { get; set; }
- }
-}
diff --git a/src/Microsoft.AspNetCore.Diagnostics/exceptions.net45.json b/src/Microsoft.AspNetCore.Diagnostics/exceptions.net45.json
new file mode 100644
index 0000000000..760c105f32
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Diagnostics/exceptions.net45.json
@@ -0,0 +1,30 @@
+[
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.CompilationErrorPageModel",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.CompilationErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorDetails",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorPageModel",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.StackFrame",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.StackFrameInfo",
+ "Kind": "Removal"
+ }
+]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Diagnostics/exceptions.netcore.json b/src/Microsoft.AspNetCore.Diagnostics/exceptions.netcore.json
new file mode 100644
index 0000000000..760c105f32
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Diagnostics/exceptions.netcore.json
@@ -0,0 +1,30 @@
+[
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.CompilationErrorPageModel",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.CompilationErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorDetails",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorPageModel",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.StackFrame",
+ "Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.StackFrameInfo",
+ "Kind": "Removal"
+ }
+]
\ No newline at end of file