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

Merge branch 'release/2.1' into dev

This commit is contained in:
Ajay Bhargav Baaskaran 2018-03-26 12:09:30 -07:00
parent caa34545ed 77200410d6
commit f0f2ff1dc8
18 changed files with 2602 additions and 4015 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/Microsoft.AspNetCore.Diagnostics.Abstractions/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Diagnostics.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Diagnostics.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Diagnostics.CompilationFailure", "Name": "Microsoft.AspNetCore.Diagnostics.CompilationFailure",
@ -39,6 +39,14 @@
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
}, },
{
"Kind": "Method",
"Name": "get_FailureSummary",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{ {
"Kind": "Constructor", "Kind": "Constructor",
"Name": ".ctor", "Name": ".ctor",
@ -62,6 +70,34 @@
], ],
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "sourceFilePath",
"Type": "System.String"
},
{
"Name": "sourceFileContent",
"Type": "System.String"
},
{
"Name": "compiledContent",
"Type": "System.String"
},
{
"Name": "messages",
"Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Diagnostics.DiagnosticMessage>"
},
{
"Name": "failureSummary",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
} }
], ],
"GenericParameters": [] "GenericParameters": []
@ -201,6 +237,25 @@
], ],
"GenericParameters": [] "GenericParameters": []
}, },
{
"Name": "Microsoft.AspNetCore.Diagnostics.IExceptionHandlerPathFeature",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Diagnostics.IExceptionHandlerFeature"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Path",
"Parameters": [],
"ReturnType": "System.String",
"GenericParameter": []
}
],
"GenericParameters": []
},
{ {
"Name": "Microsoft.AspNetCore.Diagnostics.IStatusCodePagesFeature", "Name": "Microsoft.AspNetCore.Diagnostics.IStatusCodePagesFeature",
"Visibility": "Public", "Visibility": "Public",
@ -274,6 +329,25 @@
], ],
"ReturnType": "System.Void", "ReturnType": "System.Void",
"GenericParameter": [] "GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_OriginalQueryString",
"Parameters": [],
"ReturnType": "System.String",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_OriginalQueryString",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"GenericParameter": []
} }
], ],
"GenericParameters": [] "GenericParameters": []

12
src/Microsoft.AspNetCore.Diagnostics.Abstractions/breakingchanges.netcore.json
View File

@ -1,12 +0,0 @@
[
{
"TypeId": "public interface Microsoft.AspNetCore.Diagnostics.IStatusCodeReExecuteFeature",
"MemberId": "System.String get_OriginalQueryString()",
"Kind": "Addition"
},
{
"TypeId": "public interface Microsoft.AspNetCore.Diagnostics.IStatusCodeReExecuteFeature",
"MemberId": "System.Void set_OriginalQueryString(System.String value)",
"Kind": "Addition"
}
]

385
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs generated
View File

@ -1,144 +1,56 @@
// <auto-generated/>
#pragma warning disable 1591
namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
{ {
#line hidden
#line 1 "DetailsPage.cshtml" #line 1 "DetailsPage.cshtml"
using System using System;
#line default #line default
#line hidden #line hidden
;
#line 2 "DetailsPage.cshtml"
using System.Globalization
#line default
#line hidden
;
#line 3 "DetailsPage.cshtml"
using System.Linq
#line default
#line hidden
;
#line 4 "DetailsPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm
#line default
#line hidden
;
#line 5 "DetailsPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
#line default
#line hidden
;
#line 6 "DetailsPage.cshtml"
using Microsoft.Extensions.RazorViews
#line default
#line hidden
;
#line 7 "DetailsPage.cshtml"
using Microsoft.Extensions.Logging
#line default
#line hidden
;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "DetailsPage.cshtml"
using System.Globalization;
#line default
#line hidden
#line 3 "DetailsPage.cshtml"
using System.Linq;
#line default
#line hidden
#line 4 "DetailsPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm;
#line default
#line hidden
#line 5 "DetailsPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews;
#line default
#line hidden
#line 6 "DetailsPage.cshtml"
using Microsoft.Extensions.RazorViews;
#line default
#line hidden
#line 7 "DetailsPage.cshtml"
using Microsoft.Extensions.Logging;
#line default
#line hidden
internal class DetailsPage : Microsoft.Extensions.RazorViews.BaseView internal class DetailsPage : Microsoft.Extensions.RazorViews.BaseView
{ {
#line 10 "DetailsPage.cshtml"
public DetailsPage(DetailsPageModel model)
{
Model = model;
}
public DetailsPageModel Model { get; set; }
public HelperResult LogRow(LogInfo log)
{
return new HelperResult((writer) =>
{
if (log.Severity >= Model.Options.MinLevel &&
(string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
{
WriteLiteralTo(writer, " <tr>\r\n <td>");
WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time));
WriteLiteralTo(writer, "</td>\r\n <td>");
WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time));
var severity = log.Severity.ToString().ToLowerInvariant();
WriteLiteralTo(writer, $"</td>\r\n <td class=\"{severity}\">");
WriteTo(writer, log.Severity);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Name}\">");
WriteTo(writer, log.Name);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Message}\""+
"class=\"logState\" width=\"100px\">");
WriteTo(writer, log.Message);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Exception}\">");
WriteTo(writer, log.Exception);
WriteLiteralTo(writer, "</td>\r\n </tr>\r\n");
}
});
}
public HelperResult Traverse(ScopeNode node)
{
return new HelperResult((writer) =>
{
var messageIndex = 0;
var childIndex = 0;
while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
{
if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
{
LogRow(node.Messages[messageIndex]);
messageIndex++;
}
else
{
Traverse(node.Children[childIndex]);
childIndex++;
}
}
if (messageIndex < node.Messages.Count)
{
for (var i = messageIndex; i < node.Messages.Count; i++)
{
LogRow(node.Messages[i]);
}
}
else
{
for (var i = childIndex; i < node.Children.Count; i++)
{
Traverse(node.Children[i]);
}
}
});
}
#line default
#line hidden
#line hidden
public DetailsPage()
{
}
#pragma warning disable 1998 #pragma warning disable 1998
public override async Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
{ {
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 84 "DetailsPage.cshtml" #line 86 "DetailsPage.cshtml"
Response.ContentType = "text/html; charset=utf-8"; Response.ContentType = "text/html; charset=utf-8";
#line default #line default
#line hidden #line hidden
WriteLiteral(@"<!DOCTYPE html> WriteLiteral(@"<!DOCTYPE html>
<html> <html>
<head> <head>
@ -205,7 +117,8 @@ table {
border: 1px solid black; border: 1px solid black;
white-space: pre-wrap; white-space: pre-wrap;
} }
");
");
WriteLiteral(@" WriteLiteral(@"
th { th {
font-family: Arial; font-family: Arial;
@ -246,54 +159,46 @@ td, th {
<body> <body>
<h1>ASP.NET Core Logs</h1> <h1>ASP.NET Core Logs</h1>
"); ");
#line 192 "DetailsPage.cshtml" #line 194 "DetailsPage.cshtml"
#line default
#line hidden
#line 192 "DetailsPage.cshtml"
var context = Model.Activity?.HttpInfo; var context = Model.Activity?.HttpInfo;
#line default #line default
#line hidden #line hidden
WriteLiteral(" "); WriteLiteral(" ");
#line 195 "DetailsPage.cshtml" #line 197 "DetailsPage.cshtml"
if (context != null) if (context != null)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <h2 id=\"requestHeader\">Request Details</h2>\r\n <table id=\"requestDetails\">\r\n <colgroup><col id=\"label\" /><col /></colgroup>\r\n\r\n <tr>\r\n <th>Path</th>\r\n <td>"); WriteLiteral(" <h2 id=\"requestHeader\">Request Details</h2>\r\n <table id=\"requestDetails\">\r\n <colgroup><col id=\"label\" /><col /></colgroup>\r\n\r\n <tr>\r\n <th>Path</th>\r\n <td>");
#line 203 "DetailsPage.cshtml" #line 205 "DetailsPage.cshtml"
Write(context.Path); Write(context.Path);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Host</th>\r\n <td>"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Host</th>\r\n <td>");
#line 207 "DetailsPage.cshtml" #line 209 "DetailsPage.cshtml"
Write(context.Host); Write(context.Host);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Content Type</th>\r\n <td>"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Content Type</th>\r\n <td>");
#line 211 "DetailsPage.cshtml" #line 213 "DetailsPage.cshtml"
Write(context.ContentType); Write(context.ContentType);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Method</th>\r\n <td>"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Method</th>\r\n <td>");
#line 215 "DetailsPage.cshtml" #line 217 "DetailsPage.cshtml"
Write(context.Method); Write(context.Method);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Protocol</th>\r\n <td>"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Protocol</th>\r\n <td>");
#line 219 "DetailsPage.cshtml" #line 221 "DetailsPage.cshtml"
Write(context.Protocol); Write(context.Protocol);
#line default #line default
@ -312,64 +217,49 @@ td, th {
</thead> </thead>
<tbody> <tbody>
"); ");
#line 232 "DetailsPage.cshtml" #line 234 "DetailsPage.cshtml"
#line default
#line hidden
#line 232 "DetailsPage.cshtml"
foreach (var header in context.Headers) foreach (var header in context.Headers)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <tr>\r\n <td>"); WriteLiteral(" <tr>\r\n <td>");
#line 235 "DetailsPage.cshtml" #line 237 "DetailsPage.cshtml"
Write(header.Key); Write(header.Key);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td>"); WriteLiteral("</td>\r\n <td>");
#line 236 "DetailsPage.cshtml" #line 238 "DetailsPage.cshtml"
Write(string.Join(";", header.Value)); Write(string.Join(";", header.Value));
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n"); WriteLiteral("</td>\r\n </tr>\r\n");
#line 238 "DetailsPage.cshtml" #line 240 "DetailsPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </tbody>\r\n </table>\r\n </td>\r\n </tr>\r\n <tr>\r\n <th>Status Code</th>\r\n <td>"); WriteLiteral(" </tbody>\r\n </table>\r\n </td>\r\n </tr>\r\n <tr>\r\n <th>Status Code</th>\r\n <td>");
#line 245 "DetailsPage.cshtml" #line 247 "DetailsPage.cshtml"
Write(context.StatusCode); Write(context.StatusCode);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>User</th>\r\n <td>"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>User</th>\r\n <td>");
#line 249 "DetailsPage.cshtml" #line 251 "DetailsPage.cshtml"
Write(context.User.Identity.Name); Write(context.User.Identity.Name);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Claims</th>\r\n <td>\r\n"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Claims</th>\r\n <td>\r\n");
#line 254 "DetailsPage.cshtml" #line 256 "DetailsPage.cshtml"
#line default
#line hidden
#line 254 "DetailsPage.cshtml"
if (context.User.Claims.Any()) if (context.User.Claims.Any())
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(@" <table id=""claimsTable""> WriteLiteral(@" <table id=""claimsTable"">
<thead> <thead>
<tr> <tr>
@ -379,71 +269,55 @@ td, th {
</thead> </thead>
<tbody> <tbody>
"); ");
#line 264 "DetailsPage.cshtml" #line 266 "DetailsPage.cshtml"
#line default
#line hidden
#line 264 "DetailsPage.cshtml"
foreach (var claim in context.User.Claims) foreach (var claim in context.User.Claims)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <tr>\r\n <td>"); WriteLiteral(" <tr>\r\n <td>");
#line 267 "DetailsPage.cshtml" #line 269 "DetailsPage.cshtml"
Write(claim.Issuer); Write(claim.Issuer);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td>"); WriteLiteral("</td>\r\n <td>");
#line 268 "DetailsPage.cshtml" #line 270 "DetailsPage.cshtml"
Write(claim.Value); Write(claim.Value);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n"); WriteLiteral("</td>\r\n </tr>\r\n");
#line 270 "DetailsPage.cshtml" #line 272 "DetailsPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </tbody>\r\n </table>\r\n"); WriteLiteral(" </tbody>\r\n </table>\r\n");
#line 273 "DetailsPage.cshtml" #line 275 "DetailsPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </td>\r\n </tr>\r\n <tr>\r\n <th>Scheme</th>\r\n <td>"); WriteLiteral(" </td>\r\n </tr>\r\n <tr>\r\n <th>Scheme</th>\r\n <td>");
#line 278 "DetailsPage.cshtml" #line 280 "DetailsPage.cshtml"
Write(context.Scheme); Write(context.Scheme);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Query</th>\r\n <td>"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Query</th>\r\n <td>");
#line 282 "DetailsPage.cshtml" #line 284 "DetailsPage.cshtml"
Write(context.Query.Value); Write(context.Query.Value);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Cookies</th>\r\n <td>\r\n"); WriteLiteral("</td>\r\n </tr>\r\n <tr>\r\n <th>Cookies</th>\r\n <td>\r\n");
#line 287 "DetailsPage.cshtml" #line 289 "DetailsPage.cshtml"
#line default
#line hidden
#line 287 "DetailsPage.cshtml"
if (context.Cookies.Any()) if (context.Cookies.Any())
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(@" <table id=""cookieTable""> WriteLiteral(@" <table id=""cookieTable"">
<thead> <thead>
<tr> <tr>
@ -453,60 +327,44 @@ td, th {
</thead> </thead>
<tbody> <tbody>
"); ");
#line 297 "DetailsPage.cshtml" #line 299 "DetailsPage.cshtml"
#line default
#line hidden
#line 297 "DetailsPage.cshtml"
foreach (var cookie in context.Cookies) foreach (var cookie in context.Cookies)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <tr>\r\n <td>"); WriteLiteral(" <tr>\r\n <td>");
#line 300 "DetailsPage.cshtml" #line 302 "DetailsPage.cshtml"
Write(cookie.Key); Write(cookie.Key);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td>"); WriteLiteral("</td>\r\n <td>");
#line 301 "DetailsPage.cshtml" #line 303 "DetailsPage.cshtml"
Write(string.Join(";", cookie.Value)); Write(string.Join(";", cookie.Value));
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n </tr>\r\n"); WriteLiteral("</td>\r\n </tr>\r\n");
#line 303 "DetailsPage.cshtml" #line 305 "DetailsPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </tbody>\r\n </table>\r\n"); WriteLiteral(" </tbody>\r\n </table>\r\n");
#line 306 "DetailsPage.cshtml" #line 308 "DetailsPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </td>\r\n </tr>\r\n </table>\r\n"); WriteLiteral(" </td>\r\n </tr>\r\n </table>\r\n");
#line 310 "DetailsPage.cshtml" #line 312 "DetailsPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" <h2>Logs</h2>\r\n <form method=\"get\">\r\n <select name=\"level\">\r\n"); WriteLiteral(" <h2>Logs</h2>\r\n <form method=\"get\">\r\n <select name=\"level\">\r\n");
#line 314 "DetailsPage.cshtml" #line 316 "DetailsPage.cshtml"
#line default
#line hidden
#line 314 "DetailsPage.cshtml"
foreach (var severity in Enum.GetValues(typeof(LogLevel))) foreach (var severity in Enum.GetValues(typeof(LogLevel)))
{ {
var severityInt = (int)severity; var severityInt = (int)severity;
@ -515,56 +373,53 @@ td, th {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <option"); WriteLiteral(" <option");
BeginWriteAttribute("value", " value=\"", 8920, "\"", 8940, 1); BeginWriteAttribute("value", " value=\"", 8857, "\"", 8877, 1);
#line 319 "DetailsPage.cshtml" #line 321 "DetailsPage.cshtml"
WriteAttributeValue("", 8928, severityInt, 8928, 12, false); WriteAttributeValue("", 8865, severityInt, 8865, 12, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(" selected=\"selected\">"); WriteLiteral(" selected=\"selected\">");
#line 319 "DetailsPage.cshtml" #line 321 "DetailsPage.cshtml"
Write(severity); Write(severity);
#line default #line default
#line hidden #line hidden
WriteLiteral("</option>\r\n"); WriteLiteral("</option>\r\n");
#line 320 "DetailsPage.cshtml" #line 322 "DetailsPage.cshtml"
} }
else else
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <option"); WriteLiteral(" <option");
BeginWriteAttribute("value", " value=\"", 9069, "\"", 9089, 1); BeginWriteAttribute("value", " value=\"", 9006, "\"", 9026, 1);
#line 323 "DetailsPage.cshtml" #line 325 "DetailsPage.cshtml"
WriteAttributeValue("", 9077, severityInt, 9077, 12, false); WriteAttributeValue("", 9014, severityInt, 9014, 12, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(">"); WriteLiteral(">");
#line 323 "DetailsPage.cshtml" #line 325 "DetailsPage.cshtml"
Write(severity); Write(severity);
#line default #line default
#line hidden #line hidden
WriteLiteral("</option>\r\n"); WriteLiteral("</option>\r\n");
#line 324 "DetailsPage.cshtml" #line 326 "DetailsPage.cshtml"
} }
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </select>\r\n <input type=\"text\" name=\"name\""); WriteLiteral(" </select>\r\n <input type=\"text\" name=\"name\"");
BeginWriteAttribute("value", " value=\"", 9202, "\"", 9235, 1); BeginWriteAttribute("value", " value=\"", 9139, "\"", 9172, 1);
#line 327 "DetailsPage.cshtml" #line 329 "DetailsPage.cshtml"
WriteAttributeValue("", 9210, Model.Options.NamePrefix, 9210, 25, false); WriteAttributeValue("", 9147, Model.Options.NamePrefix, 9147, 25, false);
#line default #line default
#line hidden #line hidden
@ -584,7 +439,7 @@ WriteAttributeValue("", 9210, Model.Options.NamePrefix, 9210, 25, false);
</tr> </tr>
</thead> </thead>
"); ");
#line 341 "DetailsPage.cshtml" #line 343 "DetailsPage.cshtml"
Write(Traverse(Model.Activity.Root)); Write(Traverse(Model.Activity.Root));
#line default #line default
@ -602,5 +457,85 @@ WriteAttributeValue("", 9210, Model.Options.NamePrefix, 9210, 25, false);
</html>"); </html>");
} }
#pragma warning restore 1998 #pragma warning restore 1998
#line 10 "DetailsPage.cshtml"
public DetailsPage(DetailsPageModel model)
{
Model = model;
}
public DetailsPageModel Model { get; set; }
public HelperResult LogRow(LogInfo log)
{
return new HelperResult((writer) =>
{
if (log.Severity >= Model.Options.MinLevel &&
(string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
{
PushWriter(writer);
WriteLiteral(" <tr>\r\n <td>");
Write(string.Format("{0:MM/dd/yy}", log.Time));
WriteLiteral("</td>\r\n <td>");
Write(string.Format("{0:H:mm:ss}", log.Time));
var severity = log.Severity.ToString().ToLowerInvariant();
WriteLiteral($"</td>\r\n <td class=\"{severity}\">");
Write(log.Severity);
WriteLiteral($"</td>\r\n <td title=\"{log.Name}\">");
Write(log.Name);
WriteLiteral($"</td>\r\n <td title=\"{log.Message}\""+
"class=\"logState\" width=\"100px\">");
Write(log.Message);
WriteLiteral($"</td>\r\n <td title=\"{log.Exception}\">");
Write(log.Exception);
WriteLiteral("</td>\r\n </tr>\r\n");
PopWriter();
}
});
}
public HelperResult Traverse(ScopeNode node)
{
return new HelperResult((writer) =>
{
var messageIndex = 0;
var childIndex = 0;
while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
{
if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
{
LogRow(node.Messages[messageIndex]);
messageIndex++;
}
else
{
Traverse(node.Children[childIndex]);
childIndex++;
}
}
if (messageIndex < node.Messages.Count)
{
for (var i = messageIndex; i < node.Messages.Count; i++)
{
LogRow(node.Messages[i]);
}
}
else
{
for (var i = childIndex; i < node.Children.Count; i++)
{
Traverse(node.Children[i]);
}
}
});
}
#line default
#line hidden
} }
} }
#pragma warning restore 1591

28
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
View File

@ -22,25 +22,27 @@
if (log.Severity >= Model.Options.MinLevel && if (log.Severity >= Model.Options.MinLevel &&
(string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
{ {
WriteLiteralTo(writer, " <tr>\r\n <td>"); PushWriter(writer);
WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time)); WriteLiteral(" <tr>\r\n <td>");
WriteLiteralTo(writer, "</td>\r\n <td>"); Write(string.Format("{0:MM/dd/yy}", log.Time));
WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time)); WriteLiteral("</td>\r\n <td>");
Write(string.Format("{0:H:mm:ss}", log.Time));
var severity = log.Severity.ToString().ToLowerInvariant(); var severity = log.Severity.ToString().ToLowerInvariant();
WriteLiteralTo(writer, $"</td>\r\n <td class=\"{severity}\">"); WriteLiteral($"</td>\r\n <td class=\"{severity}\">");
WriteTo(writer, log.Severity); Write(log.Severity);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Name}\">"); WriteLiteral($"</td>\r\n <td title=\"{log.Name}\">");
WriteTo(writer, log.Name); Write(log.Name);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Message}\""+ WriteLiteral($"</td>\r\n <td title=\"{log.Message}\""+
"class=\"logState\" width=\"100px\">"); "class=\"logState\" width=\"100px\">");
WriteTo(writer, log.Message); Write(log.Message);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Exception}\">"); WriteLiteral($"</td>\r\n <td title=\"{log.Exception}\">");
WriteTo(writer, log.Exception); Write(log.Exception);
WriteLiteralTo(writer, "</td>\r\n </tr>\r\n"); WriteLiteral("</td>\r\n </tr>\r\n");
PopWriter();
} }
}); });
} }

501
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs generated
View File

@ -1,179 +1,61 @@
// <auto-generated/>
#pragma warning disable 1591
namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
{ {
#line hidden
#line 1 "LogPage.cshtml" #line 1 "LogPage.cshtml"
using System using System;
#line default #line default
#line hidden #line hidden
;
#line 2 "LogPage.cshtml"
using System.Collections.Generic
#line default
#line hidden
;
#line 3 "LogPage.cshtml"
using System.Globalization
#line default
#line hidden
;
#line 4 "LogPage.cshtml"
using System.Linq
#line default
#line hidden
;
#line 5 "LogPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm
#line default
#line hidden
;
#line 6 "LogPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
#line default
#line hidden
;
#line 7 "LogPage.cshtml"
using Microsoft.Extensions.RazorViews
#line default
#line hidden
;
#line 8 "LogPage.cshtml"
using Microsoft.Extensions.Logging
#line default
#line hidden
;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "LogPage.cshtml"
using System.Collections.Generic;
#line default
#line hidden
#line 3 "LogPage.cshtml"
using System.Globalization;
#line default
#line hidden
#line 4 "LogPage.cshtml"
using System.Linq;
#line default
#line hidden
#line 5 "LogPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm;
#line default
#line hidden
#line 6 "LogPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews;
#line default
#line hidden
#line 7 "LogPage.cshtml"
using Microsoft.Extensions.RazorViews;
#line default
#line hidden
#line 8 "LogPage.cshtml"
using Microsoft.Extensions.Logging;
#line default
#line hidden
internal class LogPage : Microsoft.Extensions.RazorViews.BaseView internal class LogPage : Microsoft.Extensions.RazorViews.BaseView
{ {
#line 11 "LogPage.cshtml"
public LogPage(LogPageModel model)
{
Model = model;
}
public LogPageModel Model { get; set; }
public HelperResult LogRow(LogInfo log, int level)
{
return new HelperResult((writer) =>
{
if (log.Severity >= Model.Options.MinLevel &&
(string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
{
WriteLiteralTo(writer, " <tr class=\"logRow\">\r\n <td>");
WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time));
WriteLiteralTo(writer, "</td>\r\n <td>");
WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time));
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Name}\">");
WriteTo(writer, log.Name);
var severity = log.Severity.ToString().ToLowerInvariant();
WriteLiteralTo(writer, $"</td>\r\n <td class=\"{severity}\">");
WriteTo(writer, log.Severity);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Message}\"> \r\n");
for (var i = 0; i < level; i++)
{
WriteLiteralTo(writer, " <span class=\"tab\"></span>\r\n");
}
WriteLiteralTo(writer, " ");
WriteTo(writer, log.Message);
WriteLiteralTo(writer, $"\r\n </td>\r\n <td title=\"{log.Exception}\">");
WriteTo(writer, log.Exception);
WriteLiteralTo(writer, "</td>\r\n </tr>\r\n");
}
});
}
public HelperResult Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
{
return new HelperResult((writer) => {
// print start of scope
WriteTo(writer, LogRow(new LogInfo()
{
Name = node.Name,
Time = node.StartTime,
Severity = LogLevel.Debug,
Message = "Beginning " + node.State,
}, level));
var messageIndex = 0;
var childIndex = 0;
while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
{
if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
{
WriteTo(writer, LogRow(node.Messages[messageIndex], level));
counts[node.Messages[messageIndex].Severity.ToString()]++;
messageIndex++;
}
else
{
WriteTo(writer, Traverse(node.Children[childIndex], level + 1, counts));
childIndex++;
}
}
if (messageIndex < node.Messages.Count)
{
for (var i = messageIndex; i < node.Messages.Count; i++)
{
WriteTo(writer, LogRow(node.Messages[i], level));
counts[node.Messages[i].Severity.ToString()]++;
}
}
else
{
for (var i = childIndex; i < node.Children.Count; i++)
{
WriteTo(writer, Traverse(node.Children[i], level + 1, counts));
}
}
// print end of scope
WriteTo(writer, LogRow(new LogInfo()
{
Name = node.Name,
Time = node.EndTime,
Severity = LogLevel.Debug,
Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime)
}, level));
});
}
#line default
#line hidden
#line hidden
public LogPage()
{
}
#pragma warning disable 1998 #pragma warning disable 1998
public override async Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
{ {
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 114 "LogPage.cshtml" #line 118 "LogPage.cshtml"
Response.ContentType = "text/html; charset=utf-8"; Response.ContentType = "text/html; charset=utf-8";
#line default #line default
#line hidden #line hidden
WriteLiteral(@" WriteLiteral(@"
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@ -322,13 +204,7 @@ tr:nth-child(2n) {
} }
"); ");
WriteLiteral("\r\n.information {\r\n color: blue;\r\n}\r\n\r\n.debug {\r\n color: black;\r\n}\r\n\r\n.warning {\r\n color: orange;\r\n}\r\n </style>\r\n</head>\r\n<body>\r\n <h1>ASP.NET Core Logs</h1>\r\n <form id=\"viewOptions\" method=\"get\">\r\n <select name=\"level\">\r\n"); WriteLiteral("\r\n.information {\r\n color: blue;\r\n}\r\n\r\n.debug {\r\n color: black;\r\n}\r\n\r\n.warning {\r\n color: orange;\r\n}\r\n </style>\r\n</head>\r\n<body>\r\n <h1>ASP.NET Core Logs</h1>\r\n <form id=\"viewOptions\" method=\"get\">\r\n <select name=\"level\">\r\n");
#line 280 "LogPage.cshtml" #line 284 "LogPage.cshtml"
#line default
#line hidden
#line 280 "LogPage.cshtml"
foreach (var severity in Enum.GetValues(typeof(LogLevel))) foreach (var severity in Enum.GetValues(typeof(LogLevel)))
{ {
var severityInt = (int)severity; var severityInt = (int)severity;
@ -337,56 +213,53 @@ tr:nth-child(2n) {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <option"); WriteLiteral(" <option");
BeginWriteAttribute("value", " value=\"", 6825, "\"", 6845, 1); BeginWriteAttribute("value", " value=\"", 6741, "\"", 6761, 1);
#line 285 "LogPage.cshtml" #line 289 "LogPage.cshtml"
WriteAttributeValue("", 6833, severityInt, 6833, 12, false); WriteAttributeValue("", 6749, severityInt, 6749, 12, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(" selected=\"selected\">"); WriteLiteral(" selected=\"selected\">");
#line 285 "LogPage.cshtml" #line 289 "LogPage.cshtml"
Write(severity); Write(severity);
#line default
#line hidden
WriteLiteral("</option>\r\n");
#line 286 "LogPage.cshtml"
}
else
{
#line default
#line hidden
WriteLiteral(" <option");
BeginWriteAttribute("value", " value=\"", 6974, "\"", 6994, 1);
#line 289 "LogPage.cshtml"
WriteAttributeValue("", 6982, severityInt, 6982, 12, false);
#line default
#line hidden
EndWriteAttribute();
WriteLiteral(">");
#line 289 "LogPage.cshtml"
Write(severity);
#line default #line default
#line hidden #line hidden
WriteLiteral("</option>\r\n"); WriteLiteral("</option>\r\n");
#line 290 "LogPage.cshtml" #line 290 "LogPage.cshtml"
} }
else
{
#line default
#line hidden
WriteLiteral(" <option");
BeginWriteAttribute("value", " value=\"", 6890, "\"", 6910, 1);
#line 293 "LogPage.cshtml"
WriteAttributeValue("", 6898, severityInt, 6898, 12, false);
#line default
#line hidden
EndWriteAttribute();
WriteLiteral(">");
#line 293 "LogPage.cshtml"
Write(severity);
#line default
#line hidden
WriteLiteral("</option>\r\n");
#line 294 "LogPage.cshtml"
}
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </select>\r\n <input type=\"text\" name=\"name\""); WriteLiteral(" </select>\r\n <input type=\"text\" name=\"name\"");
BeginWriteAttribute("value", " value=\"", 7107, "\"", 7140, 1); BeginWriteAttribute("value", " value=\"", 7023, "\"", 7056, 1);
#line 293 "LogPage.cshtml" #line 297 "LogPage.cshtml"
WriteAttributeValue("", 7115, Model.Options.NamePrefix, 7115, 25, false); WriteAttributeValue("", 7031, Model.Options.NamePrefix, 7031, 25, false);
#line default #line default
#line hidden #line hidden
@ -416,27 +289,14 @@ WriteAttributeValue("", 7115, Model.Options.NamePrefix, 7115, 25, false);
<col /> <col />
</colgroup> </colgroup>
"); ");
#line 317 "LogPage.cshtml" #line 321 "LogPage.cshtml"
#line default
#line hidden
#line 317 "LogPage.cshtml"
foreach (var activity in Model.Activities.Reverse()) foreach (var activity in Model.Activities.Reverse())
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <tbody>\r\n <tr class=\"requestRow\">\r\n"); WriteLiteral(" <tbody>\r\n <tr class=\"requestRow\">\r\n");
#line 321 "LogPage.cshtml" #line 325 "LogPage.cshtml"
#line default
#line hidden
#line 321 "LogPage.cshtml"
var activityPath = Model.Path.Value + "/" + activity.Id; var activityPath = Model.Path.Value + "/" + activity.Id;
if (activity.HttpInfo != null) if (activity.HttpInfo != null)
@ -444,101 +304,97 @@ WriteAttributeValue("", 7115, Model.Options.NamePrefix, 7115, 25, false);
#line default #line default
#line hidden #line hidden
WriteLiteral(" \t<td><a"); WriteLiteral(" \t<td><a");
BeginWriteAttribute("href", " href=\"", 8204, "\"", 8224, 1); BeginWriteAttribute("href", " href=\"", 8120, "\"", 8140, 1);
#line 325 "LogPage.cshtml" #line 329 "LogPage.cshtml"
WriteAttributeValue("", 8211, activityPath, 8211, 13, false); WriteAttributeValue("", 8127, activityPath, 8127, 13, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
BeginWriteAttribute("title", " title=\"", 8225, "\"", 8256, 1); BeginWriteAttribute("title", " title=\"", 8141, "\"", 8172, 1);
#line 325 "LogPage.cshtml" #line 329 "LogPage.cshtml"
WriteAttributeValue("", 8233, activity.HttpInfo.Path, 8233, 23, false); WriteAttributeValue("", 8149, activity.HttpInfo.Path, 8149, 23, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(">"); WriteLiteral(">");
#line 325 "LogPage.cshtml" #line 329 "LogPage.cshtml"
Write(activity.HttpInfo.Path); Write(activity.HttpInfo.Path);
#line default #line default
#line hidden #line hidden
WriteLiteral("</a></td>\r\n <td>"); WriteLiteral("</a></td>\r\n <td>");
#line 326 "LogPage.cshtml" #line 330 "LogPage.cshtml"
Write(activity.HttpInfo.Method); Write(activity.HttpInfo.Method);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td>"); WriteLiteral("</td>\r\n <td>");
#line 327 "LogPage.cshtml" #line 331 "LogPage.cshtml"
Write(activity.HttpInfo.Host); Write(activity.HttpInfo.Host);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td>"); WriteLiteral("</td>\r\n <td>");
#line 328 "LogPage.cshtml" #line 332 "LogPage.cshtml"
Write(activity.HttpInfo.StatusCode); Write(activity.HttpInfo.StatusCode);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n"); WriteLiteral("</td>\r\n");
#line 329 "LogPage.cshtml" #line 333 "LogPage.cshtml"
} }
else if (activity.RepresentsScope) else if (activity.RepresentsScope)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <td colspan=\"4\"><a"); WriteLiteral(" <td colspan=\"4\"><a");
BeginWriteAttribute("href", " href=\"", 8646, "\"", 8666, 1); BeginWriteAttribute("href", " href=\"", 8562, "\"", 8582, 1);
#line 332 "LogPage.cshtml" #line 336 "LogPage.cshtml"
WriteAttributeValue("", 8653, activityPath, 8653, 13, false); WriteAttributeValue("", 8569, activityPath, 8569, 13, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
BeginWriteAttribute("title", " title=\"", 8667, "\"", 8695, 1); BeginWriteAttribute("title", " title=\"", 8583, "\"", 8611, 1);
#line 332 "LogPage.cshtml" #line 336 "LogPage.cshtml"
WriteAttributeValue("", 8675, activity.Root.State, 8675, 20, false); WriteAttributeValue("", 8591, activity.Root.State, 8591, 20, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(">"); WriteLiteral(">");
#line 332 "LogPage.cshtml" #line 336 "LogPage.cshtml"
Write(activity.Root.State); Write(activity.Root.State);
#line default #line default
#line hidden #line hidden
WriteLiteral("</a></td>\r\n"); WriteLiteral("</a></td>\r\n");
#line 333 "LogPage.cshtml" #line 337 "LogPage.cshtml"
} }
else else
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <td colspan=\"4\"><a"); WriteLiteral(" <td colspan=\"4\"><a");
BeginWriteAttribute("href", " href=\"", 8858, "\"", 8878, 1); BeginWriteAttribute("href", " href=\"", 8774, "\"", 8794, 1);
#line 336 "LogPage.cshtml" #line 340 "LogPage.cshtml"
WriteAttributeValue("", 8865, activityPath, 8865, 13, false); WriteAttributeValue("", 8781, activityPath, 8781, 13, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(">Non-scope Log</a></td>\r\n"); WriteLiteral(">Non-scope Log</a></td>\r\n");
#line 337 "LogPage.cshtml" #line 341 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(@" <td class=""logTd""> WriteLiteral(@" <td class=""logTd"">
<table class=""logTable""> <table class=""logTable"">
<thead class=""logHeader""> <thead class=""logHeader"">
@ -552,13 +408,7 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
</tr> </tr>
</thead> </thead>
"); ");
#line 351 "LogPage.cshtml" #line 355 "LogPage.cshtml"
#line default
#line hidden
#line 351 "LogPage.cshtml"
var counts = new Dictionary<string, int>(); var counts = new Dictionary<string, int>();
counts["Critical"] = 0; counts["Critical"] = 0;
@ -570,15 +420,8 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
#line default #line default
#line hidden #line hidden
WriteLiteral(" <tbody class=\"logBody\">\r\n"); WriteLiteral(" <tbody class=\"logBody\">\r\n");
#line 360 "LogPage.cshtml" #line 364 "LogPage.cshtml"
#line default
#line hidden
#line 360 "LogPage.cshtml"
if (!activity.RepresentsScope) if (!activity.RepresentsScope)
{ {
// message not within a scope // message not within a scope
@ -587,13 +430,12 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
#line default #line default
#line hidden #line hidden
#line 368 "LogPage.cshtml"
#line 364 "LogPage.cshtml"
Write(LogRow(logInfo, 0)); Write(LogRow(logInfo, 0));
#line default #line default
#line hidden #line hidden
#line 364 "LogPage.cshtml" #line 368 "LogPage.cshtml"
counts[logInfo.Severity.ToString()] = 1; counts[logInfo.Severity.ToString()] = 1;
} }
@ -603,88 +445,76 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
#line default #line default
#line hidden #line hidden
#line 373 "LogPage.cshtml"
#line 369 "LogPage.cshtml"
Write(Traverse(activity.Root, 0, counts)); Write(Traverse(activity.Root, 0, counts));
#line default #line default
#line hidden #line hidden
#line 369 "LogPage.cshtml" #line 373 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </tbody>\r\n <tbody class=\"summary\">\r\n <tr class=\"logRow\">\r\n <td>"); WriteLiteral(" </tbody>\r\n <tbody class=\"summary\">\r\n <tr class=\"logRow\">\r\n <td>");
#line 374 "LogPage.cshtml" #line 378 "LogPage.cshtml"
Write(activity.Time.ToString("MM-dd-yyyy HH:mm:ss")); Write(activity.Time.ToString("MM-dd-yyyy HH:mm:ss"));
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n"); WriteLiteral("</td>\r\n");
#line 375 "LogPage.cshtml" #line 379 "LogPage.cshtml"
#line default
#line hidden
#line 375 "LogPage.cshtml"
foreach (var kvp in counts) foreach (var kvp in counts)
{ {
if (string.Equals("Debug", kvp.Key)) { if (string.Equals("Debug", kvp.Key)) {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <td>"); WriteLiteral(" <td>");
#line 378 "LogPage.cshtml" #line 382 "LogPage.cshtml"
Write(kvp.Value); Write(kvp.Value);
#line default #line default
#line hidden #line hidden
WriteLiteral(" "); WriteLiteral(" ");
#line 378 "LogPage.cshtml" #line 382 "LogPage.cshtml"
Write(kvp.Key); Write(kvp.Key);
#line default #line default
#line hidden #line hidden
WriteLiteral("<span class=\"collapse\">v</span></td>\r\n"); WriteLiteral("<span class=\"collapse\">v</span></td>\r\n");
#line 379 "LogPage.cshtml" #line 383 "LogPage.cshtml"
} }
else else
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <td>"); WriteLiteral(" <td>");
#line 382 "LogPage.cshtml" #line 386 "LogPage.cshtml"
Write(kvp.Value); Write(kvp.Value);
#line default #line default
#line hidden #line hidden
WriteLiteral(" "); WriteLiteral(" ");
#line 382 "LogPage.cshtml" #line 386 "LogPage.cshtml"
Write(kvp.Key); Write(kvp.Key);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n"); WriteLiteral("</td>\r\n");
#line 383 "LogPage.cshtml" #line 387 "LogPage.cshtml"
} }
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </tr>\r\n </tbody>\r\n </table>\r\n </td>\r\n </tr>\r\n </tbody>\r\n"); WriteLiteral(" </tr>\r\n </tbody>\r\n </table>\r\n </td>\r\n </tr>\r\n </tbody>\r\n");
#line 391 "LogPage.cshtml" #line 395 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(@" </table> WriteLiteral(@" </table>
<script type=""text/javascript""> <script type=""text/javascript"">
$(document).ready(function () { $(document).ready(function () {
@ -706,5 +536,116 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
</html>"); </html>");
} }
#pragma warning restore 1998 #pragma warning restore 1998
#line 11 "LogPage.cshtml"
public LogPage(LogPageModel model)
{
Model = model;
}
public LogPageModel Model { get; set; }
public HelperResult LogRow(LogInfo log, int level)
{
return new HelperResult((writer) =>
{
if (log.Severity >= Model.Options.MinLevel &&
(string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
{
PushWriter(writer);
WriteLiteral(" <tr class=\"logRow\">\r\n <td>");
Write(string.Format("{0:MM/dd/yy}", log.Time));
WriteLiteral("</td>\r\n <td>");
Write(string.Format("{0:H:mm:ss}", log.Time));
WriteLiteral($"</td>\r\n <td title=\"{log.Name}\">");
Write(log.Name);
var severity = log.Severity.ToString().ToLowerInvariant();
WriteLiteral($"</td>\r\n <td class=\"{severity}\">");
Write(log.Severity);
WriteLiteral($"</td>\r\n <td title=\"{log.Message}\"> \r\n");
for (var i = 0; i < level; i++)
{
WriteLiteral(" <span class=\"tab\"></span>\r\n");
}
WriteLiteral(" ");
Write(log.Message);
WriteLiteral($"\r\n </td>\r\n <td title=\"{log.Exception}\">");
Write(log.Exception);
WriteLiteral("</td>\r\n </tr>\r\n");
PopWriter();
}
});
}
public HelperResult Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
{
return new HelperResult((writer) => {
PushWriter(writer);
// print start of scope
Write(LogRow(new LogInfo()
{
Name = node.Name,
Time = node.StartTime,
Severity = LogLevel.Debug,
Message = "Beginning " + node.State,
}, level));
var messageIndex = 0;
var childIndex = 0;
while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
{
if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
{
Write(LogRow(node.Messages[messageIndex], level));
counts[node.Messages[messageIndex].Severity.ToString()]++;
messageIndex++;
}
else
{
Write(Traverse(node.Children[childIndex], level + 1, counts));
childIndex++;
}
}
if (messageIndex < node.Messages.Count)
{
for (var i = messageIndex; i < node.Messages.Count; i++)
{
Write(LogRow(node.Messages[i], level));
counts[node.Messages[i].Severity.ToString()]++;
}
}
else
{
for (var i = childIndex; i < node.Children.Count; i++)
{
Write(Traverse(node.Children[i], level + 1, counts));
}
}
// print end of scope
Write(LogRow(new LogInfo()
{
Name = node.Name,
Time = node.EndTime,
Severity = LogLevel.Debug,
Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime)
}, level));
PopWriter();
});
}
#line default
#line hidden
} }
} }
#pragma warning restore 1591

50
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
View File

@ -23,35 +23,35 @@
if (log.Severity >= Model.Options.MinLevel && if (log.Severity >= Model.Options.MinLevel &&
(string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
{ {
PushWriter(writer);
WriteLiteral(" <tr class=\"logRow\">\r\n <td>");
Write(string.Format("{0:MM/dd/yy}", log.Time));
WriteLiteralTo(writer, " <tr class=\"logRow\">\r\n <td>"); WriteLiteral("</td>\r\n <td>");
WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time)); Write(string.Format("{0:H:mm:ss}", log.Time));
WriteLiteralTo(writer, "</td>\r\n <td>"); WriteLiteral($"</td>\r\n <td title=\"{log.Name}\">");
WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time)); Write(log.Name);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Name}\">");
WriteTo(writer, log.Name);
var severity = log.Severity.ToString().ToLowerInvariant(); var severity = log.Severity.ToString().ToLowerInvariant();
WriteLiteralTo(writer, $"</td>\r\n <td class=\"{severity}\">"); WriteLiteral($"</td>\r\n <td class=\"{severity}\">");
WriteTo(writer, log.Severity); Write(log.Severity);
WriteLiteralTo(writer, $"</td>\r\n <td title=\"{log.Message}\"> \r\n"); WriteLiteral($"</td>\r\n <td title=\"{log.Message}\"> \r\n");
for (var i = 0; i < level; i++) for (var i = 0; i < level; i++)
{ {
WriteLiteralTo(writer, " <span class=\"tab\"></span>\r\n"); WriteLiteral(" <span class=\"tab\"></span>\r\n");
} }
WriteLiteralTo(writer, " "); WriteLiteral(" ");
WriteTo(writer, log.Message); Write(log.Message);
WriteLiteralTo(writer, $"\r\n </td>\r\n <td title=\"{log.Exception}\">"); WriteLiteral($"\r\n </td>\r\n <td title=\"{log.Exception}\">");
WriteTo(writer, log.Exception); Write(log.Exception);
WriteLiteralTo(writer, "</td>\r\n </tr>\r\n");
WriteLiteral("</td>\r\n </tr>\r\n");
PopWriter();
} }
}); });
} }
@ -59,8 +59,10 @@
public HelperResult Traverse(ScopeNode node, int level, Dictionary<string, int> counts) public HelperResult Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
{ {
return new HelperResult((writer) => { return new HelperResult((writer) => {
PushWriter(writer);
// print start of scope // print start of scope
WriteTo(writer, LogRow(new LogInfo() Write(LogRow(new LogInfo()
{ {
Name = node.Name, Name = node.Name,
Time = node.StartTime, Time = node.StartTime,
@ -74,14 +76,14 @@
{ {
if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
{ {
WriteTo(writer, LogRow(node.Messages[messageIndex], level)); Write(LogRow(node.Messages[messageIndex], level));
counts[node.Messages[messageIndex].Severity.ToString()]++; counts[node.Messages[messageIndex].Severity.ToString()]++;
messageIndex++; messageIndex++;
} }
else else
{ {
WriteTo(writer, Traverse(node.Children[childIndex], level + 1, counts)); Write(Traverse(node.Children[childIndex], level + 1, counts));
childIndex++; childIndex++;
} }
} }
@ -89,7 +91,7 @@
{ {
for (var i = messageIndex; i < node.Messages.Count; i++) for (var i = messageIndex; i < node.Messages.Count; i++)
{ {
WriteTo(writer, LogRow(node.Messages[i], level)); Write(LogRow(node.Messages[i], level));
counts[node.Messages[i].Severity.ToString()]++; counts[node.Messages[i].Severity.ToString()]++;
} }
} }
@ -97,17 +99,19 @@
{ {
for (var i = childIndex; i < node.Children.Count; i++) for (var i = childIndex; i < node.Children.Count; i++)
{ {
WriteTo(writer, Traverse(node.Children[i], level + 1, counts)); Write(Traverse(node.Children[i], level + 1, counts));
} }
} }
// print end of scope // print end of scope
WriteTo(writer, LogRow(new LogInfo() Write(LogRow(new LogInfo()
{ {
Name = node.Name, Name = node.Name,
Time = node.EndTime, Time = node.EndTime,
Severity = LogLevel.Debug, Severity = LogLevel.Debug,
Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime) Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime)
}, level)); }, level));
PopWriter();
}); });
} }
} }

1085
src/Microsoft.AspNetCore.Diagnostics.Elm/baseline.netcore.json
View File

File diff suppressed because it is too large Load Diff

105
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.Designer.cs generated
View File

@ -1,56 +1,33 @@
// <auto-generated/>
#pragma warning disable 1591
namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
{ {
#line hidden
#line 1 "DatabaseErrorPage.cshtml" #line 1 "DatabaseErrorPage.cshtml"
using System using System;
#line default #line default
#line hidden #line hidden
;
#line 2 "DatabaseErrorPage.cshtml"
using System.Linq
#line default
#line hidden
;
#line 3 "DatabaseErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
#line default
#line hidden
;
#line 4 "DatabaseErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
#line default
#line hidden
;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "DatabaseErrorPage.cshtml"
using System.Linq;
#line default
#line hidden
#line 3 "DatabaseErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
#line default
#line hidden
#line 4 "DatabaseErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views;
#line default
#line hidden
internal class DatabaseErrorPage : Microsoft.Extensions.RazorViews.BaseView internal class DatabaseErrorPage : Microsoft.Extensions.RazorViews.BaseView
{ {
#line 11 "DatabaseErrorPage.cshtml"
public DatabaseErrorPageModel Model { get; set; }
public string UrlEncode(string content)
{
return UrlEncoder.Encode(content);
}
public string JavaScriptEncode(string content)
{
return JavaScriptEncoder.Encode(content);
}
#line default
#line hidden
#line hidden
public DatabaseErrorPage()
{
}
#pragma warning disable 1998 #pragma warning disable 1998
public override async Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
{ {
#line 5 "DatabaseErrorPage.cshtml" #line 5 "DatabaseErrorPage.cshtml"
@ -60,7 +37,6 @@ using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
#line default #line default
#line hidden #line hidden
WriteLiteral(@"<!DOCTYPE html> WriteLiteral(@"<!DOCTYPE html>
<html lang=""en"" xmlns=""http://www.w3.org/1999/xhtml""> <html lang=""en"" xmlns=""http://www.w3.org/1999/xhtml"">
@ -158,19 +134,12 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral("</h1>\r\n <p>\r\n"); WriteLiteral("</h1>\r\n <p>\r\n");
#line 115 "DatabaseErrorPage.cshtml"
#line default
#line hidden
#line 115 "DatabaseErrorPage.cshtml" #line 115 "DatabaseErrorPage.cshtml"
for (Exception ex = Model.Exception; ex != null; ex = ex.InnerException) for (Exception ex = Model.Exception; ex != null; ex = ex.InnerException)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <span>"); WriteLiteral(" <span>");
#line 117 "DatabaseErrorPage.cshtml" #line 117 "DatabaseErrorPage.cshtml"
Write(ex.GetType().Name); Write(ex.GetType().Name);
@ -189,21 +158,13 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral(" </p>\r\n <hr />\r\n\r\n"); WriteLiteral(" </p>\r\n <hr />\r\n\r\n");
#line 123 "DatabaseErrorPage.cshtml"
#line default
#line hidden
#line 123 "DatabaseErrorPage.cshtml" #line 123 "DatabaseErrorPage.cshtml"
if (!Model.DatabaseExists && !Model.PendingMigrations.Any()) if (!Model.DatabaseExists && !Model.PendingMigrations.Any())
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <h2>"); WriteLiteral(" <h2>");
#line 125 "DatabaseErrorPage.cshtml" #line 125 "DatabaseErrorPage.cshtml"
Write(Strings.FormatDatabaseErrorPage_NoDbOrMigrationsTitle(Model.ContextType.Name)); Write(Strings.FormatDatabaseErrorPage_NoDbOrMigrationsTitle(Model.ContextType.Name));
@ -254,7 +215,6 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div>\r\n <h2>"); WriteLiteral(" <div>\r\n <h2>");
#line 139 "DatabaseErrorPage.cshtml" #line 139 "DatabaseErrorPage.cshtml"
Write(Strings.FormatDatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name)); Write(Strings.FormatDatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name));
@ -268,19 +228,12 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral("</p>\r\n\r\n <ul>\r\n"); WriteLiteral("</p>\r\n\r\n <ul>\r\n");
#line 143 "DatabaseErrorPage.cshtml"
#line default
#line hidden
#line 143 "DatabaseErrorPage.cshtml" #line 143 "DatabaseErrorPage.cshtml"
foreach (var migration in Model.PendingMigrations) foreach (var migration in Model.PendingMigrations)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <li>"); WriteLiteral(" <li>");
#line 145 "DatabaseErrorPage.cshtml" #line 145 "DatabaseErrorPage.cshtml"
Write(migration); Write(migration);
@ -293,7 +246,6 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral(" </ul>\r\n\r\n <p>\r\n <button id=\"applyMigrations\" onclick=\"ApplyMigrations()\">"); WriteLiteral(" </ul>\r\n\r\n <p>\r\n <button id=\"applyMigrations\" onclick=\"ApplyMigrations()\">");
#line 150 "DatabaseErrorPage.cshtml" #line 150 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_ApplyMigrationsButton); Write(Strings.DatabaseErrorPage_ApplyMigrationsButton);
@ -400,7 +352,6 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div>\r\n <h2>"); WriteLiteral(" <div>\r\n <h2>");
#line 200 "DatabaseErrorPage.cshtml" #line 200 "DatabaseErrorPage.cshtml"
Write(Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name)); Write(Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name));
@ -449,9 +400,25 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral("</body>\r\n</html>"); WriteLiteral("</body>\r\n</html>");
} }
#pragma warning restore 1998 #pragma warning restore 1998
#line 11 "DatabaseErrorPage.cshtml"
public DatabaseErrorPageModel Model { get; set; }
public string UrlEncode(string content)
{
return UrlEncoder.Encode(content);
}
public string JavaScriptEncode(string content)
{
return JavaScriptEncoder.Encode(content);
}
#line default
#line hidden
} }
} }
#pragma warning restore 1591

878
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/baseline.netcore.json
View File

@ -1,609 +1,6 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DatabaseErrorPageMiddleware",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "Invoke",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "next",
"Type": "Microsoft.AspNetCore.Http.RequestDelegate"
},
{
"Name": "serviceProvider",
"Type": "System.IServiceProvider"
},
{
"Name": "loggerFactory",
"Type": "Microsoft.Extensions.Logging.ILoggerFactory"
},
{
"Name": "options",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLogger",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.Extensions.Logging.ILogger"
],
"Members": [
{
"Kind": "Method",
"Name": "get_LastError",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLogger+DataStoreErrorLog",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "StartLoggingForCurrentCallContext",
"Parameters": [],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Log<T0>",
"Parameters": [
{
"Name": "logLevel",
"Type": "Microsoft.Extensions.Logging.LogLevel"
},
{
"Name": "eventId",
"Type": "Microsoft.Extensions.Logging.EventId"
},
{
"Name": "state",
"Type": "T0"
},
{
"Name": "exception",
"Type": "System.Exception"
},
{
"Name": "formatter",
"Type": "System.Func<T0, System.Exception, System.String>"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.Logging.ILogger",
"Visibility": "Public",
"GenericParameter": [
{
"ParameterName": "TState",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
}
]
},
{
"Kind": "Method",
"Name": "IsEnabled",
"Parameters": [
{
"Name": "logLevel",
"Type": "Microsoft.Extensions.Logging.LogLevel"
}
],
"ReturnType": "System.Boolean",
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.Logging.ILogger",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "BeginScope<T0>",
"Parameters": [
{
"Name": "state",
"Type": "T0"
}
],
"ReturnType": "System.IDisposable",
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.Logging.ILogger",
"Visibility": "Public",
"GenericParameter": [
{
"ParameterName": "TState",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
}
]
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLoggerProvider",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.Extensions.Logging.ILoggerProvider"
],
"Members": [
{
"Kind": "Method",
"Name": "CreateLogger",
"Parameters": [
{
"Name": "name",
"Type": "System.String"
}
],
"ReturnType": "Microsoft.Extensions.Logging.ILogger",
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.Logging.ILoggerProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Logger",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLogger",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Dispose",
"Parameters": [],
"ReturnType": "System.Void",
"Virtual": true,
"ImplementedInterface": "System.IDisposable",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.MigrationsEndPointMiddleware",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "Invoke",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "next",
"Type": "Microsoft.AspNetCore.Http.RequestDelegate"
},
{
"Name": "serviceProvider",
"Type": "System.IServiceProvider"
},
{
"Name": "logger",
"Type": "Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.MigrationsEndPointMiddleware>"
},
{
"Name": "options",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.MigrationsEndPointOptions>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views.DatabaseErrorPage",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Model",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views.DatabaseErrorPageModel",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Model",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views.DatabaseErrorPageModel"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "UrlEncode",
"Parameters": [
{
"Name": "content",
"Type": "System.String"
}
],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "JavaScriptEncode",
"Parameters": [
{
"Name": "content",
"Type": "System.String"
}
],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ExecuteAsync",
"Parameters": [],
"ReturnType": "System.Threading.Tasks.Task",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views.DatabaseErrorPageModel",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_ContextType",
"Parameters": [],
"ReturnType": "System.Type",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Exception",
"Parameters": [],
"ReturnType": "System.Exception",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_DatabaseExists",
"Parameters": [],
"ReturnType": "System.Boolean",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_PendingModelChanges",
"Parameters": [],
"ReturnType": "System.Boolean",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_PendingMigrations",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Options",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "contextType",
"Type": "System.Type"
},
{
"Name": "exception",
"Type": "System.Exception"
},
{
"Name": "databaseExists",
"Type": "System.Boolean"
},
{
"Name": "pendingModelChanges",
"Type": "System.Boolean"
},
{
"Name": "pendingMigrations",
"Type": "System.Collections.Generic.IEnumerable<System.String>"
},
{
"Name": "options",
"Type": "Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.DatabaseErrorPageExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "UseDatabaseErrorPage",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "UseDatabaseErrorPage",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
},
{
"Name": "options",
"Type": "Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_MigrationsEndPointPath",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.PathString",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_MigrationsEndPointPath",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Http.PathString"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.MigrationsEndPointExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "UseMigrationsEndPoint",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "UseMigrationsEndPoint",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
},
{
"Name": "options",
"Type": "Microsoft.AspNetCore.Builder.MigrationsEndPointOptions"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.MigrationsEndPointOptions",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Path",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.PathString",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Path",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Http.PathString"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Field",
"Name": "DefaultPath",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.PathString",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{ {
"Name": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.AttributeValue", "Name": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.AttributeValue",
"Visibility": "Public", "Visibility": "Public",
@ -1127,22 +524,162 @@
"GenericParameters": [] "GenericParameters": []
}, },
{ {
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLogger+DataStoreErrorLog", "Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DatabaseErrorPageMiddleware",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"System.IObserver<System.Diagnostics.DiagnosticListener>",
"System.IObserver<System.Collections.Generic.KeyValuePair<System.String, System.Object>>"
],
"Members": [
{
"Kind": "Method",
"Name": "Invoke",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "next",
"Type": "Microsoft.AspNetCore.Http.RequestDelegate"
},
{
"Name": "loggerFactory",
"Type": "Microsoft.Extensions.Logging.ILoggerFactory"
},
{
"Name": "options",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.MigrationsEndPointMiddleware",
"Visibility": "Public", "Visibility": "Public",
"Kind": "Class", "Kind": "Class",
"ImplementedInterfaces": [], "ImplementedInterfaces": [],
"Members": [ "Members": [
{ {
"Kind": "Method", "Kind": "Method",
"Name": "SetError", "Name": "Invoke",
"Parameters": [ "Parameters": [
{ {
"Name": "contextType", "Name": "context",
"Type": "System.Type" "Type": "Microsoft.AspNetCore.Http.HttpContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "next",
"Type": "Microsoft.AspNetCore.Http.RequestDelegate"
}, },
{ {
"Name": "exception", "Name": "logger",
"Type": "System.Exception" "Type": "Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.MigrationsEndPointMiddleware>"
},
{
"Name": "options",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.MigrationsEndPointOptions>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.DatabaseErrorPageExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "UseDatabaseErrorPage",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "UseDatabaseErrorPage",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
},
{
"Name": "options",
"Type": "Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_MigrationsEndPointPath",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.PathString",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_MigrationsEndPointPath",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Http.PathString"
} }
], ],
"ReturnType": "System.Void", "ReturnType": "System.Void",
@ -1150,33 +687,6 @@
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
}, },
{
"Kind": "Method",
"Name": "get_IsErrorLogged",
"Parameters": [],
"ReturnType": "System.Boolean",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_ContextType",
"Parameters": [],
"ReturnType": "System.Type",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Exception",
"Parameters": [],
"ReturnType": "System.Exception",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{ {
"Kind": "Constructor", "Kind": "Constructor",
"Name": ".ctor", "Name": ".ctor",
@ -1186,6 +696,100 @@
} }
], ],
"GenericParameters": [] "GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.MigrationsEndPointExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "UseMigrationsEndPoint",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "UseMigrationsEndPoint",
"Parameters": [
{
"Name": "app",
"Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
},
{
"Name": "options",
"Type": "Microsoft.AspNetCore.Builder.MigrationsEndPointOptions"
}
],
"ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Builder.MigrationsEndPointOptions",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Path",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.PathString",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Path",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Http.PathString"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Field",
"Name": "DefaultPath",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.PathString",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
} }
] ]
} }

37
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/breakingchanges.netcore.json
View File

@ -1,37 +0,0 @@
[
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views.DatabaseErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views.DatabaseErrorPageModel",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.MigrationsEndPointMiddleware",
"MemberId": "public .ctor(Microsoft.AspNetCore.Http.RequestDelegate next, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.MigrationsEndPointMiddleware> logger, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.MigrationsEndPointOptions> options)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DatabaseErrorPageMiddleware",
"MemberId": "public .ctor(Microsoft.AspNetCore.Http.RequestDelegate next, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions> options)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLogger : Microsoft.Extensions.Logging.ILogger",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLogger+DataStoreErrorLog",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DataStoreErrorLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.DatabaseErrorPageMiddleware",
"MemberId": "public virtual System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context)",
"Kind": "Removal"
}
]

289
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs generated
View File

@ -1,58 +1,43 @@
// <auto-generated/>
#pragma warning disable 1591
namespace Microsoft.AspNetCore.Diagnostics.RazorViews namespace Microsoft.AspNetCore.Diagnostics.RazorViews
{ {
#line hidden
#line 1 "CompilationErrorPage.cshtml" #line 1 "CompilationErrorPage.cshtml"
using System using System;
#line default #line default
#line hidden #line hidden
;
#line 2 "CompilationErrorPage.cshtml"
using System.Globalization
#line default
#line hidden
;
#line 3 "CompilationErrorPage.cshtml"
using System.Linq
#line default
#line hidden
;
#line 4 "CompilationErrorPage.cshtml"
using System.Net
#line default
#line hidden
;
#line 5 "CompilationErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics
#line default
#line hidden
;
#line 6 "CompilationErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.RazorViews
#line default
#line hidden
;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "CompilationErrorPage.cshtml"
using System.Globalization;
#line default
#line hidden
#line 3 "CompilationErrorPage.cshtml"
using System.Linq;
#line default
#line hidden
#line 4 "CompilationErrorPage.cshtml"
using System.Net;
#line default
#line hidden
#line 5 "CompilationErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics;
#line default
#line hidden
#line 6 "CompilationErrorPage.cshtml"
using Microsoft.AspNetCore.Diagnostics.RazorViews;
#line default
#line hidden
internal class CompilationErrorPage : Microsoft.Extensions.RazorViews.BaseView internal class CompilationErrorPage : Microsoft.Extensions.RazorViews.BaseView
{ {
#line 8 "CompilationErrorPage.cshtml"
public CompilationErrorPageModel Model { get; set; }
#line default
#line hidden
#line hidden
public CompilationErrorPage()
{
}
#pragma warning disable 1998 #pragma warning disable 1998
public override async Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
{ {
#line 11 "CompilationErrorPage.cshtml" #line 11 "CompilationErrorPage.cshtml"
@ -62,7 +47,6 @@ using Microsoft.AspNetCore.Diagnostics.RazorViews
#line default #line default
#line hidden #line hidden
WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n <head>\r\n <meta charset=\"utf-8\" />\r\n <title>"); WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n <head>\r\n <meta charset=\"utf-8\" />\r\n <title>");
#line 20 "CompilationErrorPage.cshtml" #line 20 "CompilationErrorPage.cshtml"
Write(Resources.ErrorPageHtml_Title); Write(Resources.ErrorPageHtml_Title);
@ -283,18 +267,11 @@ a {
WriteLiteral("</h1>\r\n"); WriteLiteral("</h1>\r\n");
#line 223 "CompilationErrorPage.cshtml" #line 223 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 223 "CompilationErrorPage.cshtml"
var exceptionDetailId = ""; var exceptionDetailId = "";
#line default #line default
#line hidden #line hidden
WriteLiteral(" "); WriteLiteral(" ");
#line 226 "CompilationErrorPage.cshtml" #line 226 "CompilationErrorPage.cshtml"
for (var i = 0; i < Model.ErrorDetails.Count; i++) for (var i = 0; i < Model.ErrorDetails.Count; i++)
@ -305,362 +282,257 @@ a {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div id=\"stackpage\" class=\"page\">\r\n"); WriteLiteral(" <div id=\"stackpage\" class=\"page\">\r\n");
#line 232 "CompilationErrorPage.cshtml" #line 232 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 232 "CompilationErrorPage.cshtml"
var stackFrameCount = 0; var stackFrameCount = 0;
var frameId = ""; var frameId = "";
#line default
#line hidden
WriteLiteral(" ");
#line 236 "CompilationErrorPage.cshtml"
var fileName = errorDetail.StackFrames.FirstOrDefault()?.File; var fileName = errorDetail.StackFrames.FirstOrDefault()?.File;
if (!string.IsNullOrEmpty(fileName)) if (!string.IsNullOrEmpty(fileName))
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div class=\"titleerror\">"); WriteLiteral(" <div class=\"titleerror\">");
#line 240 "CompilationErrorPage.cshtml" #line 238 "CompilationErrorPage.cshtml"
Write(fileName); Write(fileName);
#line default #line default
#line hidden #line hidden
WriteLiteral("</div>\r\n"); WriteLiteral("</div>\r\n");
#line 241 "CompilationErrorPage.cshtml" #line 239 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" "); WriteLiteral(" ");
#line 243 "CompilationErrorPage.cshtml" #line 241 "CompilationErrorPage.cshtml"
if (!string.IsNullOrEmpty(errorDetail.ErrorMessage)) if (!string.IsNullOrEmpty(errorDetail.ErrorMessage))
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div class=\"details\">"); WriteLiteral(" <div class=\"details\">");
#line 245 "CompilationErrorPage.cshtml" #line 243 "CompilationErrorPage.cshtml"
Write(errorDetail.ErrorMessage); Write(errorDetail.ErrorMessage);
#line default #line default
#line hidden #line hidden
WriteLiteral("</div>\r\n"); WriteLiteral("</div>\r\n");
#line 246 "CompilationErrorPage.cshtml" #line 244 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" <br />\r\n <ul>\r\n"); WriteLiteral(" <br />\r\n <ul>\r\n");
#line 249 "CompilationErrorPage.cshtml" #line 247 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 249 "CompilationErrorPage.cshtml"
foreach (var frame in errorDetail.StackFrames) foreach (var frame in errorDetail.StackFrames)
{ {
stackFrameCount++;
frameId = "frame" + stackFrameCount;
#line default #line default
#line hidden #line hidden
#line 251 "CompilationErrorPage.cshtml"
stackFrameCount++;
frameId = "frame" + stackFrameCount;
#line default
#line hidden
#line 254 "CompilationErrorPage.cshtml"
#line default
#line hidden
WriteLiteral(" <li class=\"frame\""); WriteLiteral(" <li class=\"frame\"");
BeginWriteAttribute("id", " id=\"", 5361, "\"", 5374, 1); BeginWriteAttribute("id", " id=\"", 5268, "\"", 5281, 1);
#line 255 "CompilationErrorPage.cshtml" #line 252 "CompilationErrorPage.cshtml"
WriteAttributeValue("", 5366, frameId, 5366, 8, false); WriteAttributeValue("", 5273, frameId, 5273, 8, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 256 "CompilationErrorPage.cshtml" #line 253 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 256 "CompilationErrorPage.cshtml"
if (!string.IsNullOrEmpty(frame.ErrorDetails)) if (!string.IsNullOrEmpty(frame.ErrorDetails))
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <h3>"); WriteLiteral(" <h3>");
#line 258 "CompilationErrorPage.cshtml" #line 255 "CompilationErrorPage.cshtml"
Write(frame.ErrorDetails); Write(frame.ErrorDetails);
#line default #line default
#line hidden #line hidden
WriteLiteral("</h3>\r\n"); WriteLiteral("</h3>\r\n");
#line 259 "CompilationErrorPage.cshtml" #line 256 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 261 "CompilationErrorPage.cshtml" #line 258 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 261 "CompilationErrorPage.cshtml"
if (frame.Line != 0 && frame.ContextCode.Any()) if (frame.Line != 0 && frame.ContextCode.Any())
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <button class=\"expandCollapseButton\" data-frameId=\""); WriteLiteral(" <button class=\"expandCollapseButton\" data-frameId=\"");
#line 263 "CompilationErrorPage.cshtml" #line 260 "CompilationErrorPage.cshtml"
Write(frameId); Write(frameId);
#line default #line default
#line hidden #line hidden
WriteLiteral("\">+</button>\r\n <div class=\"source\">\r\n"); WriteLiteral("\">+</button>\r\n <div class=\"source\">\r\n");
#line 265 "CompilationErrorPage.cshtml" #line 262 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 265 "CompilationErrorPage.cshtml"
if (frame.PreContextCode.Any()) if (frame.PreContextCode.Any())
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <ol"); WriteLiteral(" <ol");
BeginWriteAttribute("start", " start=\"", 5957, "\"", 5986, 1); BeginWriteAttribute("start", " start=\"", 5864, "\"", 5893, 1);
#line 267 "CompilationErrorPage.cshtml" #line 264 "CompilationErrorPage.cshtml"
WriteAttributeValue("", 5965, frame.PreContextLine, 5965, 21, false); WriteAttributeValue("", 5872, frame.PreContextLine, 5872, 21, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(" class=\"collapsible\">\r\n"); WriteLiteral(" class=\"collapsible\">\r\n");
#line 268 "CompilationErrorPage.cshtml" #line 265 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 268 "CompilationErrorPage.cshtml"
foreach (var line in frame.PreContextCode) foreach (var line in frame.PreContextCode)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <li><span>"); WriteLiteral(" <li><span>");
#line 270 "CompilationErrorPage.cshtml" #line 267 "CompilationErrorPage.cshtml"
Write(line); Write(line);
#line default #line default
#line hidden #line hidden
WriteLiteral("</span></li>\r\n"); WriteLiteral("</span></li>\r\n");
#line 271 "CompilationErrorPage.cshtml" #line 268 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </ol>\r\n"); WriteLiteral(" </ol>\r\n");
#line 273 "CompilationErrorPage.cshtml" #line 270 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" <ol"); WriteLiteral(" <ol");
BeginWriteAttribute("start", " start=\"", 6367, "\"", 6386, 1); BeginWriteAttribute("start", " start=\"", 6274, "\"", 6293, 1);
#line 274 "CompilationErrorPage.cshtml" #line 271 "CompilationErrorPage.cshtml"
WriteAttributeValue("", 6375, frame.Line, 6375, 11, false); WriteAttributeValue("", 6282, frame.Line, 6282, 11, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(" class=\"highlight\">\r\n"); WriteLiteral(" class=\"highlight\">\r\n");
#line 275 "CompilationErrorPage.cshtml" #line 272 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 275 "CompilationErrorPage.cshtml"
foreach (var line in frame.ContextCode) foreach (var line in frame.ContextCode)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <li><span>"); WriteLiteral(" <li><span>");
#line 277 "CompilationErrorPage.cshtml" #line 274 "CompilationErrorPage.cshtml"
Write(line); Write(line);
#line default #line default
#line hidden #line hidden
WriteLiteral("</span></li>\r\n"); WriteLiteral("</span></li>\r\n");
#line 278 "CompilationErrorPage.cshtml" #line 275 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </ol>\r\n"); WriteLiteral(" </ol>\r\n");
#line 280 "CompilationErrorPage.cshtml" #line 277 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 280 "CompilationErrorPage.cshtml"
if (frame.PostContextCode.Any()) if (frame.PostContextCode.Any())
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <ol"); WriteLiteral(" <ol");
BeginWriteAttribute("start", " start=\'", 6813, "\'", 6838, 1); BeginWriteAttribute("start", " start=\'", 6720, "\'", 6745, 1);
#line 282 "CompilationErrorPage.cshtml" #line 279 "CompilationErrorPage.cshtml"
WriteAttributeValue("", 6821, frame.Line + 1, 6821, 17, false); WriteAttributeValue("", 6728, frame.Line + 1, 6728, 17, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(" class=\"collapsible\">\r\n"); WriteLiteral(" class=\"collapsible\">\r\n");
#line 283 "CompilationErrorPage.cshtml" #line 280 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 283 "CompilationErrorPage.cshtml"
foreach (var line in frame.PostContextCode) foreach (var line in frame.PostContextCode)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <li><span>"); WriteLiteral(" <li><span>");
#line 285 "CompilationErrorPage.cshtml" #line 282 "CompilationErrorPage.cshtml"
Write(line); Write(line);
#line default #line default
#line hidden #line hidden
WriteLiteral("</span></li>\r\n"); WriteLiteral("</span></li>\r\n");
#line 286 "CompilationErrorPage.cshtml" #line 283 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </ol>\r\n"); WriteLiteral(" </ol>\r\n");
#line 288 "CompilationErrorPage.cshtml" #line 285 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </div>\r\n"); WriteLiteral(" </div>\r\n");
#line 290 "CompilationErrorPage.cshtml" #line 287 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </li>\r\n"); WriteLiteral(" </li>\r\n");
#line 292 "CompilationErrorPage.cshtml" #line 289 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </ul>\r\n <br />\r\n </div>\r\n"); WriteLiteral(" </ul>\r\n <br />\r\n </div>\r\n");
#line 296 "CompilationErrorPage.cshtml" #line 293 "CompilationErrorPage.cshtml"
#line default
#line hidden
#line 296 "CompilationErrorPage.cshtml"
if (!string.IsNullOrEmpty(Model.CompiledContent[i])) if (!string.IsNullOrEmpty(Model.CompiledContent[i]))
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div class=\"rawExceptionBlock\">\r\n <div class=\"showRawExceptionContainer\">\r\n <button class=\"showRawException\" data-exceptionDetailId=\""); WriteLiteral(" <div class=\"rawExceptionBlock\">\r\n <div class=\"showRawExceptionContainer\">\r\n <button class=\"showRawException\" data-exceptionDetailId=\"");
#line 300 "CompilationErrorPage.cshtml" #line 297 "CompilationErrorPage.cshtml"
Write(exceptionDetailId); Write(exceptionDetailId);
#line default #line default
#line hidden #line hidden
WriteLiteral("\">Show compilation source</button>\r\n </div>\r\n <div"); WriteLiteral("\">Show compilation source</button>\r\n </div>\r\n <div");
BeginWriteAttribute("id", " id=\"", 7741, "\"", 7764, 1); BeginWriteAttribute("id", " id=\"", 7647, "\"", 7670, 1);
#line 302 "CompilationErrorPage.cshtml" #line 299 "CompilationErrorPage.cshtml"
WriteAttributeValue("", 7746, exceptionDetailId, 7746, 18, false); WriteAttributeValue("", 7652, exceptionDetailId, 7652, 18, false);
#line default #line default
#line hidden #line hidden
EndWriteAttribute(); EndWriteAttribute();
WriteLiteral(" class=\"rawExceptionDetails\">\r\n <pre class=\"rawExceptionStackTrace\">"); WriteLiteral(" class=\"rawExceptionDetails\">\r\n <pre class=\"rawExceptionStackTrace\">");
#line 303 "CompilationErrorPage.cshtml" #line 300 "CompilationErrorPage.cshtml"
Write(Model.CompiledContent[i]); Write(Model.CompiledContent[i]);
#line default #line default
#line hidden #line hidden
WriteLiteral("</pre>\r\n </div>\r\n </div>\r\n"); WriteLiteral("</pre>\r\n </div>\r\n </div>\r\n");
#line 306 "CompilationErrorPage.cshtml" #line 303 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 303 "CompilationErrorPage.cshtml"
#line 306 "CompilationErrorPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(@" WriteLiteral(@"
<script> <script>
//<!-- //<!--
@ -868,5 +740,12 @@ WriteAttributeValue("", 7746, exceptionDetailId, 7746, 18, false);
"); ");
} }
#pragma warning restore 1998 #pragma warning restore 1998
#line 8 "CompilationErrorPage.cshtml"
public CompilationErrorPageModel Model { get; set; }
#line default
#line hidden
} }
} }
#pragma warning restore 1591

9
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml
View File

@ -36,8 +36,6 @@
@{ @{
var stackFrameCount = 0; var stackFrameCount = 0;
var frameId = ""; var frameId = "";
}
@{
var fileName = errorDetail.StackFrames.FirstOrDefault()?.File; var fileName = errorDetail.StackFrames.FirstOrDefault()?.File;
if (!string.IsNullOrEmpty(fileName)) if (!string.IsNullOrEmpty(fileName))
{ {
@ -52,10 +50,9 @@
<ul> <ul>
@foreach (var frame in errorDetail.StackFrames) @foreach (var frame in errorDetail.StackFrames)
{ {
@{ stackFrameCount++;
stackFrameCount++; frameId = "frame" + stackFrameCount;
frameId = "frame" + stackFrameCount;
}
<li class="frame" id="@frameId"> <li class="frame" id="@frameId">
@if (!string.IsNullOrEmpty(frame.ErrorDetails)) @if (!string.IsNullOrEmpty(frame.ErrorDetails))
{ {

501
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

25
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
View File

@ -33,12 +33,11 @@
@foreach (var errorDetail in Model.ErrorDetails) @foreach (var errorDetail in Model.ErrorDetails)
{ {
<div class="titleerror">@errorDetail.Error.GetType().Name: @{ Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); }</div> <div class="titleerror">@errorDetail.Error.GetType().Name: @{ Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); }</div>
@{
var firstFrame = errorDetail.StackFrames.FirstOrDefault(); var firstFrame = errorDetail.StackFrames.FirstOrDefault();
if (firstFrame != null) if (firstFrame != null)
{ {
location = firstFrame.Function; location = firstFrame.Function;
}
} }
if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File)) if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
{ {
@ -93,19 +92,17 @@
} }
@foreach (var errorDetail in Model.ErrorDetails) @foreach (var errorDetail in Model.ErrorDetails)
{ {
@{ exceptionCount++;
exceptionCount++; exceptionDetailId = "exceptionDetail" + exceptionCount;
exceptionDetailId = "exceptionDetail" + exceptionCount;
}
<li> <li>
<h2 class="stackerror">@errorDetail.Error.GetType().Name: @errorDetail.Error.Message</h2> <h2 class="stackerror">@errorDetail.Error.GetType().Name: @errorDetail.Error.Message</h2>
<ul> <ul>
@foreach (var frame in errorDetail.StackFrames) @foreach (var frame in errorDetail.StackFrames)
{ {
@{ stackFrameCount++;
stackFrameCount++; frameId = "frame" + stackFrameCount;
frameId = "frame" + stackFrameCount;
}
<li class="frame" id="@frameId"> <li class="frame" id="@frameId">
@if (string.IsNullOrEmpty(frame.File)) @if (string.IsNullOrEmpty(frame.File))
{ {

58
src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.Designer.cs generated
View File

@ -1,28 +1,23 @@
// <auto-generated/>
#pragma warning disable 1591
namespace Microsoft.AspNetCore.Diagnostics.RazorViews namespace Microsoft.AspNetCore.Diagnostics.RazorViews
{ {
#line hidden
#line 1 "WelcomePage.cshtml" #line 1 "WelcomePage.cshtml"
using System using System;
#line default #line default
#line hidden #line hidden
;
#line 2 "WelcomePage.cshtml"
using Microsoft.AspNetCore.Diagnostics
#line default
#line hidden
;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "WelcomePage.cshtml"
using Microsoft.AspNetCore.Diagnostics;
#line default
#line hidden
internal class WelcomePage : Microsoft.Extensions.RazorViews.BaseView internal class WelcomePage : Microsoft.Extensions.RazorViews.BaseView
{ {
#line hidden
public WelcomePage()
{
}
#pragma warning disable 1998 #pragma warning disable 1998
public override async Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
{ {
#line 3 "WelcomePage.cshtml" #line 3 "WelcomePage.cshtml"
@ -30,7 +25,6 @@ using Microsoft.AspNetCore.Diagnostics
#line default #line default
#line hidden #line hidden
WriteLiteral("<!DOCTYPE html>\r\n<html"); WriteLiteral("<!DOCTYPE html>\r\n<html");
BeginWriteAttribute("lang", " lang=\"", 141, "\"", 223, 1); BeginWriteAttribute("lang", " lang=\"", 141, "\"", 223, 1);
#line 7 "WelcomePage.cshtml" #line 7 "WelcomePage.cshtml"
@ -45,9 +39,8 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
#line default #line default
#line hidden #line hidden
WriteLiteral(@"</title> WriteLiteral("</title>\r\n <style type=\"text/css\">\r\n ");
<style type=""text/css""> WriteLiteral(@"@font-face {
@font-face {
font-family: 'SegoeLight', helvetica, sans-serif; font-family: 'SegoeLight', helvetica, sans-serif;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
@ -85,9 +78,9 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
} }
.content .bodyContent a { .content .bodyContent a {
"); color: #fff;
WriteLiteral(@" color: #fff; text-decorat");
text-decoration: none; WriteLiteral(@"ion: none;
} }
.content .bodyContent a:hover { .content .bodyContent a:hover {
@ -121,9 +114,9 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
} }
.content .bodyCTA div img { .content .bodyCTA div img {
"); position: absolute;
WriteLiteral(@" position: absolute; ");
top: 0; WriteLiteral(@" top: 0;
left: 0; left: 0;
border: 0; border: 0;
} }
@ -163,10 +156,10 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
.browser div { .browser div {
width: 384px; width: 384px;
height: 305px; height: 305px;
position: absol"); position: absolute;
WriteLiteral(@"ute;
top: 40px; top: 40px;
left: 100px; ");
WriteLiteral(@" left: 100px;
font-size: 200px; font-size: 200px;
text-align: left; text-align: left;
-webkit-touch-callout: none; -webkit-touch-callout: none;
@ -206,11 +199,11 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
<div class=""wrapper""> <div class=""wrapper"">
<div class=""innerwrapper""> <div class=""innerwrapper"">
<div class=""light first""> <div class=""light first"">
"); <img src=""data:image/png;base64,iVBORw");
WriteLiteral(@" <img src=""data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARIAAAESCAYAAAAxN1ojAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACKhJREFUeNrs3TFPG0kYgOE1kou4IIVTUITiXJAiFFxBk/8vGopQQBEKKFyci7jAhRsX3E4YB3I5Asva3p2Z55EspJNOOq/3Xn8zu7arCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADI1MAhILi/v9+v/wwb/murwWCwcPQQknJCMa7/jOLj3X/+bsKqfiye/F3Gx6KOzcorICSkGY0P9WM/hmK/4/+kZYxLeHwXFyGh3+EYx0cK1lGZh4ewCAm7D0fYyziIjxCOYQZPaxajMqujsvQqCwnbj8dB5k83TCtTURESNheQdTgOCz0EsxiUqbNBSGg+fUzqx8dqc1dVUreKU8qtKUVI+HNAQjSOCp4+mkwpN3VQ5g6FkPAYkHGMh4A0E0LyTVCEpPSAhPs7jqt0LtkKCkJiCVNEUC7dti8kuQdkvYl65GhsVdiUvXKTm5DkGJFwCfdz5SrMroSIXNcxuXEohCSXZcxJZR+kK2GZ89VyR0hSjsh6GTN0NDp3EycUyx0hMYVgOhGSMiJyECNiCumvMJl8cxiEpI8BCeEIm6ku6aYhXCo+t9QRkr4tZU6r7r9AiGZCRM4sdYSkDxEZx4hYyqTrwqeLhaTLiIRlzIkjkYVpHZMLh0FIdh2REBD7IXmZxenEvomQbD0gNlXzFvZLzsRESLYdkS+VTdUSYnLuC5SERERoyxUdIRERxERIRAQxERIRQUzKsucQiAgvCufC3/GcQEga+SwiPBHOhS9iIiRNphE3m/FcTE4dBiF5TUT8LAR/Mo5vNAjJsxEJH8BzkvCSw/iGg5D8FpGRsZUGTuIbD0LyMyLDylcB0NypzVchecoVGt5iaIoVkvU"); WriteLiteral(@"0KGgoAAAANSUhEUgAAARIAAAESCAYAAAAxN1ojAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACKhJREFUeNrs3TFPG0kYgOE1kou4IIVTUITiXJAiFFxBk/8vGopQQBEKKFyci7jAhRsX3E4YB3I5Asva3p2Z55EspJNOOq/3Xn8zu7arCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADI1MAhILi/v9+v/wwb/murwWCwcPQQknJCMa7/jOLj3X/+bsKqfiye/F3Gx6KOzcorICSkGY0P9WM/hmK/4/+kZYxLeHwXFyGh3+EYx0cK1lGZh4ewCAm7D0fYyziIjxCOYQZPaxajMqujsvQqCwnbj8dB5k83TCtTURESNheQdTgOCz0EsxiUqbNBSGg+fUzqx8dqc1dVUreKU8qtKUVI+HNAQjSOCp4+mkwpN3VQ5g6FkPAYkHGMh4A0E0LyTVCEpPSAhPs7jqt0LtkKCkJiCVNEUC7dti8kuQdkvYl65GhsVdiUvXKTm5DkGJFwCfdz5SrMroSIXNcxuXEohCSXZcxJZR+kK2GZ89VyR0hSjsh6GTN0NDp3EycUyx0hMYVgOhGSMiJyECNiCumvMJl8cxiEpI8BCeEIm6ku6aYhXCo+t9QRkr4tZU6r7r9AiGZCRM4sdYSkDxEZx4hYyqTrwqeLhaTLiIRlzIkjkYVpHZMLh0FIdh2REBD7IXmZxenEvomQbD0gNlXzFvZLzsRESLYdkS+VTdUSYnLuC5SERERoyxUdIRERxERIRAQxERIRQUzKsucQiAgvCufC3/GcQEga+SwiPBHOhS9iIiRNphE3m/FcTE4dBiF5TUT8LAR/Mo5vNAjJsxEJH8BzkvCSw/iGg5D8FpGRsZUGTuIbD0LyMyLDylcB0NypzVchecoVGt5iaIoVkvU0Er5j1XqXtwqbr5+EpOyIrL/tHdo4Kn2/pPSJxLe9s7Fzqe");
WriteLiteral(@"0Er5j1XqXtwqbr5+EpOyIrL/tHdo4Kn2/pPSJxLe9s7FzqeT9kmJDEn+8yq47m7L+YXghKWxJ44e82bRJqUucUicSSxoscYSk1TRyYEnDlpc4EyHJOyLrL26GbTqKy2chyXUNG98xYBfLZyHJcBqxwcoujUvaeC1pIhERdu1YSPKaRsLnaNwGz67tl/J1A6VMJMfOaUzCQtJmGgnrVJd76cqohKmkhInEkgZTiZC0mkZGQoKpREi8E2AyFpJOp5GhaYQeyfq+kpwnkolzF1OJkLT10XlL30KS6yeDswxJ/ISvz9RgKhGSVg6cr/TUX0KSxjRik5U+G8WPbAiJaQQsb4QEnKNC8sKyRkiwvBESpcfyRkiEBIo7V3MLia8LIKXlTTb3OmUTkvg5Br9Vg6lESFr54LzEBC0kXhSEREi8KNDQMJfLwFmEpNQfbsaSXEi8GBCYSLwY0Np7IREScO5mFBJfYkSyctjj2/MigDdCE4lpBOewkHgRIP19khxC8s55SOKS/4yYiQS6Z7PVRAKYSKAHUv/MzZ6XEHoh6X2SpEOS4++DgJCoOBS5RLe0ASEREkBIACEBEBJASAAhAYQEQEgAIQGEBHi0EhIHH9q6E5KODAaDhfMPhASwtPECgOk6j5BY3oCQmEgoXvJvhiYS8GYoJLWl85DEzYVESMBEYmkDnbtL/QkkH5LBYLAyleDNUEi8EJRsGd8MhURIoOxzN5eQfHc+kqh5Dk/CRALdusvhSWQRkrjGFBNSPHdNJJY3YFmTW0jmzksSMxMSIQFTdG4hifskYkIqljl9w19u35A2c35ighYSIaEUWZ2rWYWkHhXDZ25cBqbvVvW5KiQ9N3WeYhoREi8SQiIkvVjeuHpDXy1zW9bkOpFY3mAaEZKNTCUhJL5dnj66FRJTCbQxj0tvIVF+eLObXJ9YtiGJ5XcFh77IcpO1hIkk63cAknOd85PLOiTxS2NcCqZrq3gBQEgS9s15TMey36/LPiSmErqeRkpYYu8V8mKaSuhsGsn"); WriteLiteral(@"T9kmJDEn+8yq47m7L+YXghKWxJ44e82bRJqUucUicSSxoscYSk1TRyYEnDlpc4EyHJOyLrL26GbTqKy2chyXUNG98xYBfLZyHJcBqxwcoujUvaeC1pIhERdu1YSPKaRsLnaNwGz67tl/J1A6VMJMfOaUzCQtJmGgnrVJd76cqohKmkhInEkgZTiZC0mkZGQoKpREi8E2AyFpJOp5GhaYQeyfq+kpwnkolzF1OJkLT10XlL30KS6yeDswxJ/ISvz9RgKhGSVg6cr/TUX0KSxjRik5U+G8WPbAiJaQQsb4QEnKNC8sKyRkiwvBESpcfyRkiEBIo7V3MLia8LIKXlTTb3OmUTkvg5Br9Vg6lESFr54LzEBC0kXhSEREi8KNDQMJfLwFmEpNQfbsaSXEi8GBCYSLwY0Np7IREScO5mFBJfYkSyctjj2/MigDdCE4lpBOewkHgRIP19khxC8s55SOKS/4yYiQS6Z7PVRAKYSKAHUv/MzZ6XEHoh6X2SpEOS4++DgJCoOBS5RLe0ASEREkBIACEBEBJASAAhAYQEQEgAIQGEBHi0EhIHH9q6E5KODAaDhfMPhASwtPECgOk6j5BY3oCQmEgoXvJvhiYS8GYoJLWl85DEzYVESMBEYmkDnbtL/QkkH5LBYLAyleDNUEi8EJRsGd8MhURIoOxzN5eQfHc+kqh5Dk/CRALdusvhSWQRkrjGFBNSPHdNJJY3YFmTW0jmzksSMxMSIQFTdG4hifskYkIqljl9w19u35A2c35ighYSIaEUWZ2rWYWkHhXDZ25cBqbvVvW5KiQ9N3WeYhoREi8SQiIkvVjeuHpDXy1zW9bkOpFY3mAaEZKNTCUhJL5dnj66FRJTCbQxj0tvIVF+eLObXJ9YtiGJ5XcFh77IcpO1hIkk63cAknOd85PLOiTxS2NcCqZrq3gBQEgS9s15TMey36/LPiSmErqeRkpYYu8V8mKaSuhsGsnhd2uExFRCd8KVmiLexPYKelFNJezadSlPtJiQxKnE3a7syi");
WriteLiteral(@"hd2uExFRCd8KVmiLexPYKelFNJezadSlPtJiQxKnE3a7syiL3KzWlTiTrdwifwWEXLkt6skWFJN7t6tZ5tm2ayw9fCcnzMQl7Jb6OkW0JE+9VaU96r9AX+9L5zpZclXC5V0iqnxuvPofDps1L2mA1kTwIG69L5z4bXNJclPrkiw1JHD/Pnf9syEWuX1okJC/HZFEVdNMQWzPL+btGhOR1MQlXcdw+z1stS17SCMmvzis3qtHcj+VxiVdphOT/p5JwIpw5EjR0FZfHxROSx5gsjKg0MC31Uq+QvByTcGI4OXhJuF/Em46Q/DEm4QSx+cpzwuTqtgEheZXzyudx+J3NVSFpNJWsN1/FhKcROSv5pjMheXtMvlYuC/MYEW8sQvKmmCziZCImZRMRIRETWrkQkVf8f+IQvM79/f1+/edL/Rg6GsUsZ85L+6YzIdldTE7rx8jRyD4iljNCstWYDONksu9oiAhC0jYmYTIZOxpZWcTljEu8QrLToJzUfw4diSzMKzebCUmHMZnUfz47Ekmb+uyMkPQhJuO41HFFJy0/fjrCp3iFpE8xsQmblmVcythUFZJeBuVT/efIkei18P2qF/ZDhCSFpU7YiHW/iaWMkNB6qRMmk4mj0QvzqvCfjBAS0wmmECERkx/TyaSyd7Jr06rQ3+IVkryDMorTiTtitytcibn0gTshKWG5c1y5VLxpYf/j2jJGSEoLymFc7tg/aScsXW7jryYiJILiaDQPSP24sQ8iJPwalPCwh/KKJUz18OPdAiIkPBOUcQyKTxb/ah6nj5lDISS8PijDGJO/Cl72hOkjhOPWzWRCQvuo7MeoHBQQlVWMx8z0ISSIingICYlEZRSDMo6PlL4TZR4f//g4v5DQv2nlQ/Vws9v7qj83vYX9jUUMx527ToWE9OIyjkugUfV4aXlbl5gXcZkyj3/vwj9zmVZIyH+CWS+H3jdYGq0j8XAimTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); WriteLiteral(@"L3KzWlTiTrdwifwWEXLkt6skWFJN7t6tZ5tm2ayw9fCcnzMQl7Jb6OkW0JE+9VaU96r9AX+9L5zpZclXC5V0iqnxuvPofDps1L2mA1kTwIG69L5z4bXNJclPrkiw1JHD/Pnf9syEWuX1okJC/HZFEVdNMQWzPL+btGhOR1MQlXcdw+z1stS17SCMmvzis3qtHcj+VxiVdphOT/p5JwIpw5EjR0FZfHxROSx5gsjKg0MC31Uq+QvByTcGI4OXhJuF/Em46Q/DEm4QSx+cpzwuTqtgEheZXzyudx+J3NVSFpNJWsN1/FhKcROSv5pjMheXtMvlYuC/MYEW8sQvKmmCziZCImZRMRIRETWrkQkVf8f+IQvM79/f1+/edL/Rg6GsUsZ85L+6YzIdldTE7rx8jRyD4iljNCstWYDONksu9oiAhC0jYmYTIZOxpZWcTljEu8QrLToJzUfw4diSzMKzebCUmHMZnUfz47Ekmb+uyMkPQhJuO41HFFJy0/fjrCp3iFpE8xsQmblmVcythUFZJeBuVT/efIkei18P2qF/ZDhCSFpU7YiHW/iaWMkNB6qRMmk4mj0QvzqvCfjBAS0wmmECERkx/TyaSyd7Jr06rQ3+IVkryDMorTiTtitytcibn0gTshKWG5c1y5VLxpYf/j2jJGSEoLymFc7tg/aScsXW7jryYiJILiaDQPSP24sQ8iJPwalPCwh/KKJUz18OPdAiIkPBOUcQyKTxb/ah6nj5lDISS8PijDGJO/Cl72hOkjhOPWzWRCQvuo7MeoHBQQlVWMx8z0ISSIingICYlEZRSDMo6PlL4TZR4f//g4v5DQv2nlQ/Vws9v7qj83vYX9jUUMx527ToWE9OIyjkugUfV4aXlbl5gXcZkyj3/vwj9zmVZIyH+CWS+H3jdYGq0j8XAimTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHL0rwADANq3ok68n5URAAAAAElFTkSuQm");
WriteLiteral("AAAAAAAAAAAAAAHL0rwADANq3ok68n5URAAAAAElFTkSuQmCC\""); WriteLiteral("CC\"");
BeginWriteAttribute("alt", "\r\n alt=\"", 7518, "\"", 7586, 1); BeginWriteAttribute("alt", "\r\n alt=\"", 7518, "\"", 7586, 1);
#line 169 "WelcomePage.cshtml" #line 169 "WelcomePage.cshtml"
WriteAttributeValue("", 7545, Resources.WelcomePageImageText_LightBulb, 7545, 41, false); WriteAttributeValue("", 7545, Resources.WelcomePageImageText_LightBulb, 7545, 41, false);
@ -370,3 +363,4 @@ WriteAttributeValue("", 49215, Resources.WelcomePageImageText_LearnMore, 49215,
#pragma warning restore 1998 #pragma warning restore 1998
} }
} }
#pragma warning restore 1591

1778
src/Microsoft.AspNetCore.Diagnostics/baseline.netcore.json
View File

File diff suppressed because it is too large Load Diff

30
src/Microsoft.AspNetCore.Diagnostics/breakingchanges.netcore.json
View File

@ -1,30 +0,0 @@
[
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.CompilationErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.CompilationErrorPageModel",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorDetails",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.ErrorPageModel",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.StackFrame",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Diagnostics.Views.StackFrameInfo",
"Kind": "Removal"
}
]

2
src/Microsoft.AspNetCore.MiddlewareAnalysis/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.MiddlewareAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.MiddlewareAnalysis, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.Extensions.DependencyInjection.AnalysisServiceCollectionExtensions", "Name": "Microsoft.Extensions.DependencyInjection.AnalysisServiceCollectionExtensions",