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

Rename AspNet 5 file contents. 

See https://github.com/aspnet/Announcements/issues/144 for more information.
This commit is contained in:
N. Taylor Mullen 2016-01-22 12:24:16 -08:00
parent 6102699916
commit f5c5816a05
148 changed files with 447 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DiagnosticsPages.sln
View File

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.23107.0 VisualStudioVersion = 14.0.23107.0
@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{ACAA
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WelcomePageSample", "samples\WelcomePageSample\WelcomePageSample.xproj", "{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WelcomePageSample", "samples\WelcomePageSample\WelcomePageSample.xproj", "{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics", "src\Microsoft.AspNet.Diagnostics\Microsoft.AspNet.Diagnostics.xproj", "{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics", "src\Microsoft.AspNetCore.Diagnostics\Microsoft.AspNetCore.Diagnostics.xproj", "{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.xproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.xproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}"
EndProject EndProject
@ -24,31 +24,31 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RuntimeInfoPageSample", "sa
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AF90579-B118-4583-AE88-672EFACB5BC4}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AF90579-B118-4583-AE88-672EFACB5BC4}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Tests", "test\Microsoft.AspNet.Diagnostics.Tests\Microsoft.AspNet.Diagnostics.Tests.xproj", "{994351B4-7B2A-4139-8B72-72C5BB5CC618}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.Tests", "test\Microsoft.AspNetCore.Diagnostics.Tests\Microsoft.AspNetCore.Diagnostics.Tests.xproj", "{994351B4-7B2A-4139-8B72-72C5BB5CC618}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExceptionHandlerSample", "samples\ExceptionHandlerSample\ExceptionHandlerSample.xproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExceptionHandlerSample", "samples\ExceptionHandlerSample\ExceptionHandlerSample.xproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Entity", "src\Microsoft.AspNet.Diagnostics.Entity\Microsoft.AspNet.Diagnostics.Entity.xproj", "{4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj", "{4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Entity.Tests", "test\Microsoft.AspNet.Diagnostics.Entity.Tests\Microsoft.AspNet.Diagnostics.Entity.Tests.xproj", "{5486117B-A742-49E0-94FC-12B76F061803}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests", "test\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj", "{5486117B-A742-49E0-94FC-12B76F061803}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Entity.FunctionalTests", "test\Microsoft.AspNet.Diagnostics.Entity.FunctionalTests\Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.xproj", "{2F9B479D-8247-4210-804B-78E6DD5C3E98}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests", "test\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj", "{2F9B479D-8247-4210-804B-78E6DD5C3E98}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Elm", "src\Microsoft.AspNet.Diagnostics.Elm\Microsoft.AspNet.Diagnostics.Elm.xproj", "{624B0019-956A-4157-B008-270C5B229553}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.Elm", "src\Microsoft.AspNetCore.Diagnostics.Elm\Microsoft.AspNetCore.Diagnostics.Elm.xproj", "{624B0019-956A-4157-B008-270C5B229553}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StatusCodePagesSample", "samples\StatusCodePagesSample\StatusCodePagesSample.xproj", "{CC1F5841-FE10-4DDB-8477-C4DE92BA759F}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StatusCodePagesSample", "samples\StatusCodePagesSample\StatusCodePagesSample.xproj", "{CC1F5841-FE10-4DDB-8477-C4DE92BA759F}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Diagnostics.Abstractions", "src\Microsoft.AspNet.Diagnostics.Abstractions\Microsoft.AspNet.Diagnostics.Abstractions.xproj", "{83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "src\Microsoft.AspNetCore.Diagnostics.Abstractions\Microsoft.AspNetCore.Diagnostics.Abstractions.xproj", "{83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ElmPageSample", "samples\ElmPageSample\ElmPageSample.xproj", "{FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ElmPageSample", "samples\ElmPageSample\ElmPageSample.xproj", "{FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DatabaseErrorPageSample", "samples\DatabaseErrorPageSample\DatabaseErrorPageSample.xproj", "{FF7F11A1-14E7-4948-A853-2487D99DE0C6}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DatabaseErrorPageSample", "samples\DatabaseErrorPageSample\DatabaseErrorPageSample.xproj", "{FF7F11A1-14E7-4948-A853-2487D99DE0C6}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.MiddlewareAnalysis", "src\Microsoft.AspNet.MiddlewareAnalysis\Microsoft.AspNet.MiddlewareAnalysis.xproj", "{C2DEDD37-D1EB-4819-9A9C-475E37A52358}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.MiddlewareAnalysis", "src\Microsoft.AspNetCore.MiddlewareAnalysis\Microsoft.AspNetCore.MiddlewareAnalysis.xproj", "{C2DEDD37-D1EB-4819-9A9C-475E37A52358}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MiddlewareAnalysisSample", "samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.xproj", "{95981429-F212-44E1-83AA-32DA9E2A517C}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MiddlewareAnalysisSample", "samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.xproj", "{95981429-F212-44E1-83AA-32DA9E2A517C}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.MiddlewareAnalysis.Tests", "test\Microsoft.AspNet.MiddlewareAnalysis.Tests\Microsoft.AspNet.MiddlewareAnalysis.Tests.xproj", "{B0166AED-738F-42EE-AF4D-C487C8B21521}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.MiddlewareAnalysis.Tests", "test\Microsoft.AspNetCore.MiddlewareAnalysis.Tests\Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj", "{B0166AED-738F-42EE-AF4D-C487C8B21521}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

8
NuGetPackageVerifier.json
View File

@ -9,10 +9,10 @@
"StrictSemanticVersionValidationRule" "StrictSemanticVersionValidationRule"
], ],
"packages": { "packages": {
"Microsoft.AspNet.Diagnostics": { }, "Microsoft.AspNetCore.Diagnostics": { },
"Microsoft.AspNet.Diagnostics.Abstractions": { }, "Microsoft.AspNetCore.Diagnostics.Abstractions": { },
"Microsoft.AspNet.Diagnostics.Elm": { }, "Microsoft.AspNetCore.Diagnostics.Elm": { },
"Microsoft.AspNet.Diagnostics.Entity": { } "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": { }
} }
}, },
"adx-nonshipping": { "adx-nonshipping": {

2
makefile.shade
View File

@ -8,7 +8,7 @@ use-standard-lifecycle
k-standard-goals k-standard-goals
#generatepages target='initialize' #generatepages target='initialize'
k command='run ../Microsoft.AspNet.Diagnostics' dnxDir='src/PageGenerator' k command='run ../Microsoft.AspNetCore.Diagnostics' dnxDir='src/PageGenerator'
#xml-docs-test .clean .build-compile description='Check generated XML documentation files for errors' target='package' #xml-docs-test .clean .build-compile description='Check generated XML documentation files for errors' target='package'
k-xml-docs-test k-xml-docs-test

6
samples/DatabaseErrorPageSample/Startup.cs
View File

@ -1,8 +1,8 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Data.Entity; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace DatabaseErrorPageSample namespace DatabaseErrorPageSample

4
samples/DatabaseErrorPageSample/hosting.json
View File

@ -1,3 +1,3 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel" "server": "Microsoft.AspNetCore.Server.Kestrel"
} }

10
samples/DatabaseErrorPageSample/project.json
View File

@ -1,10 +1,10 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "7.0.0-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"EntityFramework.MicrosoftSqlServer": "7.0.0-*", "Microsoft.EntityFrameworkCore.SqlServer": "7.0.0-*",
"EntityFramework.Commands": "7.0.0-*", "Microsoft.EntityFrameworkCore.Commands": "7.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

4
samples/DeveloperExceptionPageSample/Startup.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
namespace DeveloperExceptionPageSample namespace DeveloperExceptionPageSample
{ {

4
samples/DeveloperExceptionPageSample/hosting.json
View File

@ -1,3 +1,3 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel" "server": "Microsoft.AspNetCore.Server.Kestrel"
} }

6
samples/DeveloperExceptionPageSample/project.json
View File

@ -1,8 +1,8 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

4
samples/ElmPageSample/HelloWorldMiddleware.cs
View File

@ -2,8 +2,8 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace ElmPageSample namespace ElmPageSample

4
samples/ElmPageSample/Startup.cs
View File

@ -1,8 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;

4
samples/ElmPageSample/hosting.json
View File

@ -1,3 +1,3 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel" "server": "Microsoft.AspNetCore.Server.Kestrel"
} }

6
samples/ElmPageSample/project.json
View File

@ -1,9 +1,9 @@
{ {
"exclude": "wwwroot/**/*.*", "exclude": "wwwroot/**/*.*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics.Elm": "1.0.0-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

10
samples/ExceptionHandlerSample/Startup.cs
View File

@ -1,10 +1,10 @@
using System; using System;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNet.Http.Features; using Microsoft.AspNetCore.Http.Features;
namespace ExceptionHandlerSample namespace ExceptionHandlerSample
{ {

4
samples/ExceptionHandlerSample/hosting.json
View File

@ -1,3 +1,3 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel" "server": "Microsoft.AspNetCore.Server.Kestrel"
} }

8
samples/ExceptionHandlerSample/project.json
View File

@ -1,10 +1,10 @@
{ {
"exclude": "wwwroot/**/*.*", "exclude": "wwwroot/**/*.*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-*" "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

12
samples/MiddlewareAnalysisSample/Startup.cs
View File

@ -1,8 +1,8 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DiagnosticAdapter; using Microsoft.Extensions.DiagnosticAdapter;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -96,19 +96,19 @@ namespace MiddlewareAnaysisSample
public class TestDiagnosticListener public class TestDiagnosticListener
{ {
[DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareStarting")] [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting")]
public virtual void OnMiddlewareStarting(HttpContext httpContext, string name) public virtual void OnMiddlewareStarting(HttpContext httpContext, string name)
{ {
Console.WriteLine($"MiddlewareStarting: {name}; {httpContext.Request.Path}"); Console.WriteLine($"MiddlewareStarting: {name}; {httpContext.Request.Path}");
} }
[DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareException")] [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException")]
public virtual void OnMiddlewareException(Exception exception, string name) public virtual void OnMiddlewareException(Exception exception, string name)
{ {
Console.WriteLine($"MiddlewareException: {name}; {exception.Message}"); Console.WriteLine($"MiddlewareException: {name}; {exception.Message}");
} }
[DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareFinished")] [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished")]
public virtual void OnMiddlewareFinished(HttpContext httpContext, string name) public virtual void OnMiddlewareFinished(HttpContext httpContext, string name)
{ {
Console.WriteLine($"MiddlewareFinished: {name}; {httpContext.Response.StatusCode}"); Console.WriteLine($"MiddlewareFinished: {name}; {httpContext.Response.StatusCode}");

4
samples/MiddlewareAnalysisSample/hosting.json
View File

@ -1,3 +1,3 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel" "server": "Microsoft.AspNetCore.Server.Kestrel"
} }

8
samples/MiddlewareAnalysisSample/project.json
View File

@ -1,9 +1,9 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNet.MiddlewareAnalysis": "1.0.0-*", "Microsoft.AspNetCore.MiddlewareAnalysis": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*" "Microsoft.Extensions.Logging.Console": "1.0.0-*"
}, },

6
samples/RuntimeInfoPageSample/Startup.cs
View File

@ -1,6 +1,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
namespace RuntimeInfoPageSample namespace RuntimeInfoPageSample
{ {

4
samples/RuntimeInfoPageSample/hosting.json
View File

@ -1,3 +1,3 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel" "server": "Microsoft.AspNetCore.Server.Kestrel"
} }

6
samples/RuntimeInfoPageSample/project.json
View File

@ -1,9 +1,9 @@
{ {
"exclude": "wwwroot/**/*.*", "exclude": "wwwroot/**/*.*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "", "Microsoft.AspNetCore.Diagnostics": "",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

10
samples/StatusCodePagesSample/Startup.cs
View File

@ -6,11 +6,11 @@ using System.Net;
using System.Text; using System.Text;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNet.Http.Features; using Microsoft.AspNetCore.Http.Features;
namespace StatusCodePagesSample namespace StatusCodePagesSample
{ {

4
samples/StatusCodePagesSample/hosting.json
View File

@ -1,4 +1,4 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel", "server": "Microsoft.AspNetCore.Server.Kestrel",
"server.urls": "http://localhost:5001/base" "server.urls": "http://localhost:5001/base"
} }

6
samples/StatusCodePagesSample/project.json
View File

@ -15,9 +15,9 @@
}, },
"commands": { "web": "StatusCodePagesSample" }, "commands": { "web": "StatusCodePagesSample" },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": { },

4
samples/WelcomePageSample/Startup.cs
View File

@ -1,5 +1,5 @@
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNetCore.Hosting;
namespace WelcomePageSample namespace WelcomePageSample
{ {

4
samples/WelcomePageSample/hosting.json
View File

@ -1,3 +1,3 @@
{ {
"server": "Microsoft.AspNet.Server.Kestrel" "server": "Microsoft.AspNetCore.Server.Kestrel"
} }

6
samples/WelcomePageSample/project.json
View File

@ -1,8 +1,8 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "", "Microsoft.AspNetCore.Diagnostics": "",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

2
src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
/// <summary> /// <summary>
/// Describes a failure compiling a specific file. /// Describes a failure compiling a specific file.

2
src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
/// <summary> /// <summary>
/// A single diagnostic message. /// A single diagnostic message.

2
src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
/// <summary> /// <summary>
/// Specifies the contract for an exception representing compilation failure. /// Specifies the contract for an exception representing compilation failure.

2
src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs
View File

@ -3,7 +3,7 @@
using System; using System;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
public interface IExceptionHandlerFeature public interface IExceptionHandlerFeature
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
/// <summary> /// <summary>
/// Represents the Status code pages feature. /// Represents the Status code pages feature.

2
src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
public interface IStatusCodeReExecuteFeature public interface IStatusCodeReExecuteFeature
{ {

4
src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class ActivityContext public class ActivityContext
{ {

8
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs
View File

@ -2,13 +2,13 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNet.Http.Features; using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
/// <summary> /// <summary>
/// Enables the Elm logging service. /// Enables the Elm logging service.

4
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs
View File

@ -2,12 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics.Elm; using Microsoft.AspNetCore.Diagnostics.Elm;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
public static class ElmExtensions public static class ElmExtensions
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class ElmLogger : ILogger public class ElmLogger : ILogger
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class ElmLoggerProvider : ILoggerProvider public class ElmLoggerProvider : ILoggerProvider
{ {

4
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs
View File

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
/// <summary> /// <summary>
/// Options for ElmMiddleware /// Options for ElmMiddleware

8
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs
View File

@ -3,14 +3,14 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNet.Diagnostics.Elm.Views; using Microsoft.AspNetCore.Diagnostics.Elm.Views;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using System.Linq; using System.Linq;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
/// <summary> /// <summary>
/// Enables viewing logs captured by the <see cref="ElmCaptureMiddleware"/>. /// Enables viewing logs captured by the <see cref="ElmCaptureMiddleware"/>.

2
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs
View File

@ -6,7 +6,7 @@ using System.Runtime.Remoting.Messaging;
using System.Threading; using System.Threading;
#endif #endif
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class ElmScope public class ElmScope
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs
View File

@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics.Elm; using Microsoft.AspNetCore.Diagnostics.Elm;
namespace Microsoft.Extensions.DependencyInjection namespace Microsoft.Extensions.DependencyInjection
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class ElmStore public class ElmStore
{ {

4
src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs
View File

@ -3,9 +3,9 @@
using System; using System;
using System.Security.Claims; using System.Security.Claims;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class HttpInfo public class HttpInfo
{ {

6
src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs
View File

@ -1,9 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Http.Features; using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
internal class HttpRequestIdentifierFeature : IHttpRequestIdentifierFeature internal class HttpRequestIdentifierFeature : IHttpRequestIdentifierFeature
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class LogInfo public class LogInfo
{ {

8
src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs
View File

@ -1,11 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNet.Http.Features; using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
internal class RequestIdentifier : IDisposable internal class RequestIdentifier : IDisposable
{ {

4
src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
public class ScopeNode public class ScopeNode
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs
View File

@ -3,7 +3,7 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Diagnostics.Elm namespace Microsoft.AspNetCore.Diagnostics.Elm
{ {
/// <summary> /// <summary>
/// Options for viewing elm logs. /// Options for viewing elm logs.

10
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs
View File

@ -1,4 +1,4 @@
namespace Microsoft.AspNet.Diagnostics.Elm.Views namespace Microsoft.AspNetCore.Diagnostics.Elm.Views
{ {
#line 1 "DetailsPage.cshtml" #line 1 "DetailsPage.cshtml"
using System using System
@ -19,19 +19,19 @@ using System.Linq
#line hidden #line hidden
; ;
#line 4 "DetailsPage.cshtml" #line 4 "DetailsPage.cshtml"
using Microsoft.AspNet.Diagnostics.Elm using Microsoft.AspNetCore.Diagnostics.Elm
#line default #line default
#line hidden #line hidden
; ;
#line 5 "DetailsPage.cshtml" #line 5 "DetailsPage.cshtml"
using Microsoft.AspNet.Diagnostics.Views using Microsoft.AspNetCore.Diagnostics.Views
#line default #line default
#line hidden #line hidden
; ;
#line 6 "DetailsPage.cshtml" #line 6 "DetailsPage.cshtml"
using Microsoft.AspNet.Diagnostics.Elm.Views using Microsoft.AspNetCore.Diagnostics.Elm.Views
#line default #line default
#line hidden #line hidden
@ -44,7 +44,7 @@ using Microsoft.Extensions.Logging
; ;
using System.Threading.Tasks; using System.Threading.Tasks;
public class DetailsPage : Microsoft.AspNet.Diagnostics.Views.BaseView public class DetailsPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView
{ {
#line 10 "DetailsPage.cshtml" #line 10 "DetailsPage.cshtml"

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

@ -1,9 +1,9 @@
@using System @using System
@using System.Globalization @using System.Globalization
@using System.Linq @using System.Linq
@using Microsoft.AspNet.Diagnostics.Elm @using Microsoft.AspNetCore.Diagnostics.Elm
@using Microsoft.AspNet.Diagnostics.Views @using Microsoft.AspNetCore.Diagnostics.Views
@using Microsoft.AspNet.Diagnostics.Elm.Views @using Microsoft.AspNetCore.Diagnostics.Elm.Views
@using Microsoft.Extensions.Logging @using Microsoft.Extensions.Logging
@functions @functions

4
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs
View File

@ -1,6 +1,6 @@
using System; using System;
namespace Microsoft.AspNet.Diagnostics.Elm.Views namespace Microsoft.AspNetCore.Diagnostics.Elm.Views
{ {
public class DetailsPageModel public class DetailsPageModel
{ {

10
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs
View File

@ -1,4 +1,4 @@
namespace Microsoft.AspNet.Diagnostics.Elm.Views namespace Microsoft.AspNetCore.Diagnostics.Elm.Views
{ {
#line 1 "LogPage.cshtml" #line 1 "LogPage.cshtml"
using System using System
@ -25,19 +25,19 @@ using System.Linq
#line hidden #line hidden
; ;
#line 5 "LogPage.cshtml" #line 5 "LogPage.cshtml"
using Microsoft.AspNet.Diagnostics.Elm.Views using Microsoft.AspNetCore.Diagnostics.Elm.Views
#line default #line default
#line hidden #line hidden
; ;
#line 6 "LogPage.cshtml" #line 6 "LogPage.cshtml"
using Microsoft.AspNet.Diagnostics.Elm using Microsoft.AspNetCore.Diagnostics.Elm
#line default #line default
#line hidden #line hidden
; ;
#line 7 "LogPage.cshtml" #line 7 "LogPage.cshtml"
using Microsoft.AspNet.Diagnostics.Views using Microsoft.AspNetCore.Diagnostics.Views
#line default #line default
#line hidden #line hidden
@ -50,7 +50,7 @@ using Microsoft.Extensions.Logging
; ;
using System.Threading.Tasks; using System.Threading.Tasks;
public class LogPage : Microsoft.AspNet.Diagnostics.Views.BaseView public class LogPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView
{ {
#line 11 "LogPage.cshtml" #line 11 "LogPage.cshtml"

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

@ -1,10 +1,10 @@
@using System @using System
@using System.Collections.Generic @using System.Collections.Generic
@using System.Globalization @using System.Globalization
@using System.Linq @using System.Linq
@using Microsoft.AspNet.Diagnostics.Elm.Views @using Microsoft.AspNetCore.Diagnostics.Elm.Views
@using Microsoft.AspNet.Diagnostics.Elm @using Microsoft.AspNetCore.Diagnostics.Elm
@using Microsoft.AspNet.Diagnostics.Views @using Microsoft.AspNetCore.Diagnostics.Views
@using Microsoft.Extensions.Logging @using Microsoft.Extensions.Logging
@functions @functions

6
src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Diagnostics.Elm.Views namespace Microsoft.AspNetCore.Diagnostics.Elm.Views
{ {
public class LogPageModel public class LogPageModel
{ {

2
src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
View File

@ -10,7 +10,7 @@
"url": "git://github.com/aspnet/diagnostics" "url": "git://github.com/aspnet/diagnostics"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*" "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {

2
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/CodeAnnotations.cs
View File

@ -99,7 +99,7 @@ namespace JetBrains.Annotations
} }
} }
namespace Microsoft.Data.Entity.Relational.Utilities namespace Microsoft.EntityFrameworkCore.Relational.Utilities
{ {
internal sealed class ValidatedNotNullAttribute : Attribute internal sealed class ValidatedNotNullAttribute : Attribute
{ {

6
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
View File

@ -2,8 +2,8 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.AspNet.Diagnostics.Entity.Utilities; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities;
using Microsoft.Data.Entity.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
#if DOTNET5_4 #if DOTNET5_4
@ -12,7 +12,7 @@ using System.Threading;
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
#endif #endif
namespace Microsoft.AspNet.Diagnostics.Entity namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
public class DataStoreErrorLogger : ILogger public class DataStoreErrorLogger : ILogger
{ {

2
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLoggerProvider.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Diagnostics.Entity namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
public class DataStoreErrorLoggerProvider : ILoggerProvider public class DataStoreErrorLoggerProvider : ILoggerProvider
{ {

4
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs
View File

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// <see cref="IApplicationBuilder"/> extension methods for the <see cref="DatabaseErrorPageMiddleware"/>. /// <see cref="IApplicationBuilder"/> extension methods for the <see cref="DatabaseErrorPageMiddleware"/>.

18
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
View File

@ -5,18 +5,18 @@ using System;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Diagnostics.Entity.Utilities; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities;
using Microsoft.AspNet.Diagnostics.Entity.Views; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Data.Entity; using Microsoft.EntityFrameworkCore;
using Microsoft.Data.Entity.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.Data.Entity.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.Data.Entity.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Diagnostics.Entity namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
/// <summary> /// <summary>
/// Captures synchronous and asynchronous database related exceptions from the pipeline that may be resolved using Entity Framework /// Captures synchronous and asynchronous database related exceptions from the pipeline that may be resolved using Entity Framework

6
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs
View File

@ -1,10 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// Options for the <see cref="DatabaseErrorPageMiddleware"/>. /// Options for the <see cref="DatabaseErrorPageMiddleware"/>.

4
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs
View File

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// <see cref="IApplicationBuilder"/> extension methods for the <see cref="MigrationsEndPointMiddleware"/>. /// <see cref="IApplicationBuilder"/> extension methods for the <see cref="MigrationsEndPointMiddleware"/>.

10
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs
View File

@ -5,14 +5,14 @@ using System;
using System.Net; using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Diagnostics.Entity.Utilities; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Data.Entity; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Diagnostics.Entity namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
/// <summary> /// <summary>
/// Processes requests to execute migrations operations. The middleware will listen for requests to the path configured in the supplied options. /// Processes requests to execute migrations operations. The middleware will listen for requests to the path configured in the supplied options.

6
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs
View File

@ -1,10 +1,10 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// Options for the <see cref="MigrationsEndPointMiddleware"/>. /// Options for the <see cref="MigrationsEndPointMiddleware"/>.

4
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs generated
View File

@ -1,5 +1,5 @@
// <auto-generated /> // <auto-generated />
namespace Microsoft.AspNet.Diagnostics.Entity namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
using System.Globalization; using System.Globalization;
using System.Reflection; using System.Reflection;
@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
internal static class Strings internal static class Strings
{ {
private static readonly ResourceManager _resourceManager private static readonly ResourceManager _resourceManager
= new ResourceManager("Microsoft.AspNet.Diagnostics.Entity.Strings", typeof(Strings).GetTypeInfo().Assembly); = new ResourceManager("Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Strings", typeof(Strings).GetTypeInfo().Assembly);
/// <summary> /// <summary>
/// The string argument '{argumentName}' cannot be empty. /// The string argument '{argumentName}' cannot be empty.

2
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Utilities/Check.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace Microsoft.AspNet.Diagnostics.Entity.Utilities namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities
{ {
[DebuggerStepThrough] [DebuggerStepThrough]
internal static class Check internal static class Check

8
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cs
View File

@ -1,4 +1,4 @@
namespace Microsoft.AspNet.Diagnostics.Entity.Views namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
{ {
#line 1 "DatabaseErrorPage.cshtml" #line 1 "DatabaseErrorPage.cshtml"
using System using System
@ -13,20 +13,20 @@ using System.Linq
#line hidden #line hidden
; ;
#line 3 "DatabaseErrorPage.cshtml" #line 3 "DatabaseErrorPage.cshtml"
using Microsoft.AspNet.Diagnostics.Entity using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
#line default #line default
#line hidden #line hidden
; ;
#line 4 "DatabaseErrorPage.cshtml" #line 4 "DatabaseErrorPage.cshtml"
using Microsoft.AspNet.Diagnostics.Entity.Views using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
#line default #line default
#line hidden #line hidden
; ;
using System.Threading.Tasks; using System.Threading.Tasks;
public class DatabaseErrorPage : Microsoft.AspNet.Diagnostics.Views.BaseView public class DatabaseErrorPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView
{ {
#line 11 "DatabaseErrorPage.cshtml" #line 11 "DatabaseErrorPage.cshtml"

6
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml
View File

@ -1,7 +1,7 @@
@using System @using System
@using System.Linq @using System.Linq
@using Microsoft.AspNet.Diagnostics.Entity @using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
@using Microsoft.AspNet.Diagnostics.Entity.Views @using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
@{ @{
Response.StatusCode = 500; Response.StatusCode = 500;
Response.ContentType = "text/html"; Response.ContentType = "text/html";

6
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs
View File

@ -2,12 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Diagnostics.Entity.Utilities; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Microsoft.AspNet.Diagnostics.Entity.Views namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
{ {
public class DatabaseErrorPageModel public class DatabaseErrorPageModel
{ {

4
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
View File

@ -10,8 +10,8 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"EntityFramework.Relational": "7.0.0-*" "Microsoft.EntityFrameworkCore.Relational": "7.0.0-*"
}, },
"compile": [ "compile": [
"..\\Shared\\*.cs" "..\\Shared\\*.cs"

4
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs
View File

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// <see cref="IApplicationBuilder"/> extension methods for the <see cref="DeveloperExceptionPageMiddleware"/>. /// <see cref="IApplicationBuilder"/> extension methods for the <see cref="DeveloperExceptionPageMiddleware"/>.

14
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
View File

@ -9,16 +9,16 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Diagnostics.Views; using Microsoft.AspNetCore.Diagnostics.Views;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.PlatformAbstractions;
using StackFrame = Microsoft.AspNet.Diagnostics.Views.StackFrame; using StackFrame = Microsoft.AspNetCore.Diagnostics.Views.StackFrame;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
/// <summary> /// <summary>
/// Captures synchronous and asynchronous exceptions from the pipeline and generates HTML error responses. /// Captures synchronous and asynchronous exceptions from the pipeline and generates HTML error responses.
@ -89,9 +89,9 @@ namespace Microsoft.AspNet.Diagnostics
await DisplayException(context, ex); await DisplayException(context, ex);
if (_diagnosticSource.IsEnabled("Microsoft.AspNet.Diagnostics.UnhandledException")) if (_diagnosticSource.IsEnabled("Microsoft.AspNetCore.Diagnostics.UnhandledException"))
{ {
_diagnosticSource.Write("Microsoft.AspNet.Diagnostics.UnhandledException", new { httpContext = context, exception = ex }); _diagnosticSource.Write("Microsoft.AspNetCore.Diagnostics.UnhandledException", new { httpContext = context, exception = ex });
} }
return; return;

4
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs
View File

@ -1,10 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// Options for the <see cref="DeveloperExceptionPageMiddleware"/>. /// Options for the <see cref="DeveloperExceptionPageMiddleware"/>.

4
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs
View File

@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
/// <summary> /// <summary>
/// Holds data to be displayed on the compilation error page. /// Holds data to be displayed on the compilation error page.

6
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs
View File

@ -1,4 +1,4 @@
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
#line 1 "CompilationErrorPage.cshtml" #line 1 "CompilationErrorPage.cshtml"
using System using System
@ -25,14 +25,14 @@ using System.Net
#line hidden #line hidden
; ;
#line 5 "CompilationErrorPage.cshtml" #line 5 "CompilationErrorPage.cshtml"
using Microsoft.AspNet.Diagnostics using Microsoft.AspNetCore.Diagnostics
#line default #line default
#line hidden #line hidden
; ;
using System.Threading.Tasks; using System.Threading.Tasks;
public class CompilationErrorPage : Microsoft.AspNet.Diagnostics.Views.BaseView public class CompilationErrorPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView
{ {
#line 7 "CompilationErrorPage.cshtml" #line 7 "CompilationErrorPage.cshtml"

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

@ -1,8 +1,8 @@
@using System @using System
@using System.Globalization @using System.Globalization
@using System.Linq @using System.Linq
@using System.Net @using System.Net
@using Microsoft.AspNet.Diagnostics @using Microsoft.AspNetCore.Diagnostics
@functions @functions
{ {
public CompilationErrorPageModel Model { get; set; } public CompilationErrorPageModel Model { get; set; }

2
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
/// <summary> /// <summary>
/// Contains details for individual exception messages. /// Contains details for individual exception messages.

8
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
View File

@ -1,4 +1,4 @@
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
#line 1 "ErrorPage.cshtml" #line 1 "ErrorPage.cshtml"
using System using System
@ -25,20 +25,20 @@ using System.Net
#line hidden #line hidden
; ;
#line 5 "ErrorPage.cshtml" #line 5 "ErrorPage.cshtml"
using Microsoft.AspNet.Diagnostics.Views using Microsoft.AspNetCore.Diagnostics.Views
#line default #line default
#line hidden #line hidden
; ;
#line 6 "ErrorPage.cshtml" #line 6 "ErrorPage.cshtml"
using Microsoft.AspNet.Diagnostics using Microsoft.AspNetCore.Diagnostics
#line default #line default
#line hidden #line hidden
; ;
using System.Threading.Tasks; using System.Threading.Tasks;
public class ErrorPage : Microsoft.AspNet.Diagnostics.Views.BaseView public class ErrorPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView
{ {
#line 8 "ErrorPage.cshtml" #line 8 "ErrorPage.cshtml"

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

@ -1,9 +1,9 @@
@using System @using System
@using System.Globalization @using System.Globalization
@using System.Linq @using System.Linq
@using System.Net @using System.Net
@using Microsoft.AspNet.Diagnostics.Views @using Microsoft.AspNetCore.Diagnostics.Views
@using Microsoft.AspNet.Diagnostics @using Microsoft.AspNetCore.Diagnostics
@functions @functions
{ {
public ErrorPage(ErrorPageModel model) public ErrorPage(ErrorPageModel model)

6
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs
View File

@ -3,11 +3,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Primitives; using Microsoft.Extensions.Primitives;
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
/// <summary> /// <summary>
/// Holds data to be displayed on the error page. /// Holds data to be displayed on the error page.

2
src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs
View File

@ -5,7 +5,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
/// <summary> /// <summary>
/// Detailed exception stack information used to generate a view /// Detailed exception stack information used to generate a view

6
src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs
View File

@ -2,11 +2,11 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
public static class ExceptionHandlerExtensions public static class ExceptionHandlerExtensions
{ {

2
src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs
View File

@ -3,7 +3,7 @@
using System; using System;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
public class ExceptionHandlerFeature : IExceptionHandlerFeature public class ExceptionHandlerFeature : IExceptionHandlerFeature
{ {

10
src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs
View File

@ -4,13 +4,13 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
public class ExceptionHandlerMiddleware public class ExceptionHandlerMiddleware
{ {
@ -71,9 +71,9 @@ namespace Microsoft.AspNet.Diagnostics
await _options.ExceptionHandler(context); await _options.ExceptionHandler(context);
if (_diagnosticSource.IsEnabled("Microsoft.AspNet.Diagnostics.HandledException")) if (_diagnosticSource.IsEnabled("Microsoft.AspNetCore.Diagnostics.HandledException"))
{ {
_diagnosticSource.Write("Microsoft.AspNet.Diagnostics.HandledException", new { httpContext = context, exception = ex }); _diagnosticSource.Write("Microsoft.AspNetCore.Diagnostics.HandledException", new { httpContext = context, exception = ex });
} }
// TODO: Optional re-throw? We'll re-throw the original exception by default if the error handler throws. // TODO: Optional re-throw? We'll re-throw the original exception by default if the error handler throws.

4
src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs
View File

@ -1,9 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
public class ExceptionHandlerOptions public class ExceptionHandlerOptions
{ {

2
src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs
View File

@ -5,7 +5,7 @@ using System.Reflection;
using System.Resources; using System.Resources;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNet.Diagnostics.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Diagnostics.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: AssemblyMetadata("Serviceable", "True")] [assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: NeutralResourcesLanguage("en-US")] [assembly: NeutralResourcesLanguage("en-US")]

4
src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs generated
View File

@ -1,5 +1,5 @@
// <auto-generated /> // <auto-generated />
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
using System.Globalization; using System.Globalization;
using System.Reflection; using System.Reflection;
@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Diagnostics
internal static class Resources internal static class Resources
{ {
private static readonly ResourceManager _resourceManager private static readonly ResourceManager _resourceManager
= new ResourceManager("Microsoft.AspNet.Diagnostics.Resources", typeof(Resources).GetTypeInfo().Assembly); = new ResourceManager("Microsoft.AspNetCore.Diagnostics.Resources", typeof(Resources).GetTypeInfo().Assembly);
/// <summary> /// <summary>
/// You are seeing this page because DiagnosticsPageMiddleware was added to your web application. /// You are seeing this page because DiagnosticsPageMiddleware was added to your web application.

6
src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs
View File

@ -2,12 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
public static class RuntimeInfoExtensions public static class RuntimeInfoExtensions
{ {

8
src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs
View File

@ -3,13 +3,13 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Diagnostics.Views; using Microsoft.AspNetCore.Diagnostics.Views;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
/// <summary> /// <summary>
/// Displays information about the packages used by the application at runtime /// Displays information about the packages used by the application at runtime

4
src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs
View File

@ -1,9 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// Options for the RuntimeInfoPage /// Options for the RuntimeInfoPage

8
src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs
View File

@ -1,4 +1,4 @@
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
#line 1 "RuntimeInfoPage.cshtml" #line 1 "RuntimeInfoPage.cshtml"
using System using System
@ -19,13 +19,13 @@ using System.Linq
#line hidden #line hidden
; ;
#line 4 "RuntimeInfoPage.cshtml" #line 4 "RuntimeInfoPage.cshtml"
using Microsoft.AspNet.Diagnostics using Microsoft.AspNetCore.Diagnostics
#line default #line default
#line hidden #line hidden
; ;
#line 5 "RuntimeInfoPage.cshtml" #line 5 "RuntimeInfoPage.cshtml"
using Microsoft.AspNet.Diagnostics.Views using Microsoft.AspNetCore.Diagnostics.Views
#line default #line default
#line hidden #line hidden
@ -37,7 +37,7 @@ using Microsoft.Extensions.PlatformAbstractions;
#line hidden #line hidden
using System.Threading.Tasks; using System.Threading.Tasks;
public class RuntimeInfoPage : Microsoft.AspNet.Diagnostics.Views.BaseView public class RuntimeInfoPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView
{ {
#line 9 "RuntimeInfoPage.cshtml" #line 9 "RuntimeInfoPage.cshtml"

6
src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml
View File

@ -1,8 +1,8 @@
@using System @using System
@using System.Globalization @using System.Globalization
@using System.Linq @using System.Linq
@using Microsoft.AspNet.Diagnostics @using Microsoft.AspNetCore.Diagnostics
@using Microsoft.AspNet.Diagnostics.Views @using Microsoft.AspNetCore.Diagnostics.Views
@using Microsoft.Extensions.PlatformAbstractions; @using Microsoft.Extensions.PlatformAbstractions;
@functions @functions

2
src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNet.Diagnostics.Views namespace Microsoft.AspNetCore.Diagnostics.Views
{ {
public class RuntimeInfoPageModel public class RuntimeInfoPageModel
{ {

6
src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs
View File

@ -1,10 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
public class StatusCodeContext public class StatusCodeContext
{ {

6
src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs
View File

@ -4,11 +4,11 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
public static class StatusCodePagesExtensions public static class StatusCodePagesExtensions
{ {

2
src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
/// <summary> /// <summary>
/// Represents the Status code pages feature. /// Represents the Status code pages feature.

6
src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs
View File

@ -3,11 +3,11 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNetCore.Diagnostics
{ {
public class StatusCodePagesMiddleware public class StatusCodePagesMiddleware
{ {

8
src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs
View File

@ -4,11 +4,11 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNet.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNet.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNetCore.Builder
{ {
/// <summary> /// <summary>
/// Options for StatusCodePagesMiddleware. /// Options for StatusCodePagesMiddleware.

Some files were not shown because too many files have changed in this diff Show More