From f5c5816a05573a58e1b6520fc1e3f7de60d579ff Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 22 Jan 2016 12:24:16 -0800 Subject: [PATCH] Rename AspNet 5 file contents. See https://github.com/aspnet/Announcements/issues/144 for more information. --- DiagnosticsPages.sln | 20 ++++++++--------- NuGetPackageVerifier.json | 8 +++---- makefile.shade | 2 +- samples/DatabaseErrorPageSample/Startup.cs | 6 ++--- samples/DatabaseErrorPageSample/hosting.json | 4 ++-- samples/DatabaseErrorPageSample/project.json | 10 ++++----- .../DeveloperExceptionPageSample/Startup.cs | 4 ++-- .../DeveloperExceptionPageSample/hosting.json | 4 ++-- .../DeveloperExceptionPageSample/project.json | 6 ++--- samples/ElmPageSample/HelloWorldMiddleware.cs | 4 ++-- samples/ElmPageSample/Startup.cs | 4 ++-- samples/ElmPageSample/hosting.json | 4 ++-- samples/ElmPageSample/project.json | 6 ++--- samples/ExceptionHandlerSample/Startup.cs | 10 ++++----- samples/ExceptionHandlerSample/hosting.json | 4 ++-- samples/ExceptionHandlerSample/project.json | 8 +++---- samples/MiddlewareAnalysisSample/Startup.cs | 12 +++++----- samples/MiddlewareAnalysisSample/hosting.json | 4 ++-- samples/MiddlewareAnalysisSample/project.json | 8 +++---- samples/RuntimeInfoPageSample/Startup.cs | 6 ++--- samples/RuntimeInfoPageSample/hosting.json | 4 ++-- samples/RuntimeInfoPageSample/project.json | 6 ++--- samples/StatusCodePagesSample/Startup.cs | 10 ++++----- samples/StatusCodePagesSample/hosting.json | 4 ++-- samples/StatusCodePagesSample/project.json | 6 ++--- samples/WelcomePageSample/Startup.cs | 4 ++-- samples/WelcomePageSample/hosting.json | 4 ++-- samples/WelcomePageSample/project.json | 6 ++--- .../CompilationFailure.cs | 2 +- .../DiagnosticMessage.cs | 2 +- .../ICompilationException.cs | 2 +- .../IExceptionHandlerFeature.cs | 2 +- .../IStatusCodePagesFeature.cs | 2 +- .../IStatusCodeReExecuteFeature.cs | 2 +- .../ActivityContext.cs | 4 ++-- .../ElmCaptureMiddleware.cs | 8 +++---- .../ElmExtensions.cs | 4 ++-- .../ElmLogger.cs | 2 +- .../ElmLoggerProvider.cs | 2 +- .../ElmOptions.cs | 4 ++-- .../ElmPageMiddleware.cs | 8 +++---- .../ElmScope.cs | 2 +- .../ElmServiceCollectionExtensions.cs | 2 +- .../ElmStore.cs | 2 +- .../HttpInfo.cs | 4 ++-- .../HttpRequestIdentifierFeature.cs | 6 ++--- .../LogInfo.cs | 2 +- .../RequestIdentifier.cs | 8 +++---- .../ScopeNode.cs | 4 ++-- .../ViewOptions.cs | 2 +- .../Views/DetailsPage.cs | 10 ++++----- .../Views/DetailsPage.cshtml | 8 +++---- .../Views/DetailsPageModel.cs | 4 ++-- .../Views/LogPage.cs | 10 ++++----- .../Views/LogPage.cshtml | 8 +++---- .../Views/LogPageModel.cs | 6 ++--- .../project.json | 2 +- .../CodeAnnotations.cs | 2 +- .../DataStoreErrorLogger.cs | 6 ++--- .../DataStoreErrorLoggerProvider.cs | 2 +- .../DatabaseErrorPageExtensions.cs | 4 ++-- .../DatabaseErrorPageMiddleware.cs | 18 +++++++-------- .../DatabaseErrorPageOptions.cs | 6 ++--- .../MigrationsEndPointExtensions.cs | 4 ++-- .../MigrationsEndPointMiddleware.cs | 10 ++++----- .../MigrationsEndPointOptions.cs | 6 ++--- .../Properties/Strings.Designer.cs | 4 ++-- .../Utilities/Check.cs | 2 +- .../Views/DatabaseErrorPage.cs | 8 +++---- .../Views/DatabaseErrorPage.cshtml | 6 ++--- .../Views/DatabaseErrorPageModel.cs | 6 ++--- .../project.json | 4 ++-- .../DeveloperExceptionPageExtensions.cs | 4 ++-- .../DeveloperExceptionPageMiddleware.cs | 14 ++++++------ .../DeveloperExceptionPageOptions.cs | 4 ++-- .../Views/CompilationErrorModel.cs | 4 ++-- .../Views/CompilationErrorPage.cs | 6 ++--- .../Views/CompilationErrorPage.cshtml | 4 ++-- .../Views/ErrorDetails.cs | 2 +- .../DeveloperExceptionPage/Views/ErrorPage.cs | 8 +++---- .../Views/ErrorPage.cshtml | 6 ++--- .../Views/ErrorPageModel.cs | 6 ++--- .../Views/StackFrame.cs | 2 +- .../ExceptionHandlerExtensions.cs | 6 ++--- .../ExceptionHandlerFeature.cs | 2 +- .../ExceptionHandlerMiddleware.cs | 10 ++++----- .../ExceptionHandlerOptions.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/Resources.Designer.cs | 4 ++-- .../RuntimeInfo/RuntimeInfoExtensions.cs | 6 ++--- .../RuntimeInfo/RuntimeInfoMiddleware.cs | 8 +++---- .../RuntimeInfo/RuntimeInfoPageOptions.cs | 4 ++-- .../RuntimeInfo/Views/RuntimeInfoPage.cs | 8 +++---- .../RuntimeInfo/Views/RuntimeInfoPage.cshtml | 6 ++--- .../RuntimeInfo/Views/RuntimeInfoPageModel.cs | 2 +- .../StatusCodePage/StatusCodeContext.cs | 6 ++--- .../StatusCodePagesExtensions.cs | 6 ++--- .../StatusCodePage/StatusCodePagesFeature.cs | 2 +- .../StatusCodePagesMiddleware.cs | 6 ++--- .../StatusCodePage/StatusCodePagesOptions.cs | 8 +++---- .../StatusCodeReExecuteFeature.cs | 2 +- .../Views/AttributeValue.cs | 4 ++-- .../Views/BaseView.cs | 4 ++-- .../Views/HelperResult.cs | 2 +- .../WelcomePage/Views/WelcomePage.cs | 6 ++--- .../WelcomePage/Views/WelcomePage.cshtml | 4 ++-- .../WelcomePage/WelcomePageExtensions.cs | 6 ++--- .../WelcomePage/WelcomePageMiddleware.cs | 8 +++---- .../WelcomePage/WelcomePageOptions.cs | 4 ++-- .../project.json | 6 ++--- .../AnalysisBuilder.cs | 10 ++++----- .../AnalysisMiddleware.cs | 18 +++++++-------- .../AnalysisServiceCollectionExtensions.cs | 6 ++--- .../AnalysisStartupFilter.cs | 6 ++--- ...rosoft.AspNetCore.MiddlewareAnalysis.xproj | 4 ++-- .../project.json | 2 +- src/PageGenerator/Program.cs | 6 ++--- src/PageGenerator/project.json | 2 +- .../DatabaseErrorPageMiddlewareTest.cs | 20 ++++++++--------- .../Helpers/PlatformHelper.cs | 2 +- .../Helpers/TestLoggerProvider.cs | 2 +- .../MigrationsEndPointMiddlewareTest.cs | 22 +++++++++---------- .../SqlServerTestStore.cs | 8 +++---- .../TestModels/Blog.cs | 2 +- .../TestModels/BloggingContext.cs | 6 ++--- .../BloggingContextWithMigrations.cs | 10 ++++----- .../BloggingContextWithPendingModelChanges.cs | 8 +++---- .../BloggingContextWithSnapshotThatThrows.cs | 10 ++++----- .../project.json | 10 ++++----- .../ApiConsistencyTest.cs | 6 ++--- .../ApiConsistencyTestBase.cs | 6 ++--- .../DatabaseErrorPageOptionsTest.cs | 4 ++-- .../DatabaseErrorPageTest.cs | 12 +++++----- .../Helpers/AssertHelpers.cs | 2 +- .../Helpers/StringHelpers.cs | 4 ++-- .../TestHelperExtensions.cs | 4 ++-- .../project.json | 6 ++--- .../DeveloperExceptionPageMiddlewareTest.cs | 12 +++++----- .../ElmLoggerTest.cs | 4 ++-- .../ElmMiddlewareTest.cs | 14 ++++++------ .../ExceptionHandlerTest.cs | 12 +++++----- .../RuntimeInfoMiddlewareTest.cs | 6 ++--- .../TestDiagnosticListener.cs | 14 ++++++------ .../project.json | 6 ++--- ....AspNetCore.MiddlewareAnalysis.Tests.xproj | 4 ++-- .../MiddlewareAnalysisTests.cs | 18 +++++++-------- .../TestDiagnosticListener.cs | 12 +++++----- .../project.json | 8 +++---- 148 files changed, 447 insertions(+), 447 deletions(-) diff --git a/DiagnosticsPages.sln b/DiagnosticsPages.sln index f46829d52a..6376f67055 100644 --- a/DiagnosticsPages.sln +++ b/DiagnosticsPages.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{ACAA EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WelcomePageSample", "samples\WelcomePageSample\WelcomePageSample.xproj", "{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}" 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 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.xproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}" EndProject @@ -24,31 +24,31 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RuntimeInfoPageSample", "sa EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AF90579-B118-4583-AE88-672EFACB5BC4}" 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 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExceptionHandlerSample", "samples\ExceptionHandlerSample\ExceptionHandlerSample.xproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}" 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 -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 -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 -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 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StatusCodePagesSample", "samples\StatusCodePagesSample\StatusCodePagesSample.xproj", "{CC1F5841-FE10-4DDB-8477-C4DE92BA759F}" 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 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ElmPageSample", "samples\ElmPageSample\ElmPageSample.xproj", "{FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DatabaseErrorPageSample", "samples\DatabaseErrorPageSample\DatabaseErrorPageSample.xproj", "{FF7F11A1-14E7-4948-A853-2487D99DE0C6}" 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 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MiddlewareAnalysisSample", "samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.xproj", "{95981429-F212-44E1-83AA-32DA9E2A517C}" 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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 21f1ef867d..025db473a4 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,10 +9,10 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.AspNet.Diagnostics": { }, - "Microsoft.AspNet.Diagnostics.Abstractions": { }, - "Microsoft.AspNet.Diagnostics.Elm": { }, - "Microsoft.AspNet.Diagnostics.Entity": { } + "Microsoft.AspNetCore.Diagnostics": { }, + "Microsoft.AspNetCore.Diagnostics.Abstractions": { }, + "Microsoft.AspNetCore.Diagnostics.Elm": { }, + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": { } } }, "adx-nonshipping": { diff --git a/makefile.shade b/makefile.shade index c1bfddd1af..5dcb02558f 100644 --- a/makefile.shade +++ b/makefile.shade @@ -8,7 +8,7 @@ use-standard-lifecycle k-standard-goals #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' k-xml-docs-test diff --git a/samples/DatabaseErrorPageSample/Startup.cs b/samples/DatabaseErrorPageSample/Startup.cs index c82b06a288..ed0dc807f7 100644 --- a/samples/DatabaseErrorPageSample/Startup.cs +++ b/samples/DatabaseErrorPageSample/Startup.cs @@ -1,8 +1,8 @@ using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; namespace DatabaseErrorPageSample diff --git a/samples/DatabaseErrorPageSample/hosting.json b/samples/DatabaseErrorPageSample/hosting.json index 95505372fa..26fd5141aa 100644 --- a/samples/DatabaseErrorPageSample/hosting.json +++ b/samples/DatabaseErrorPageSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } \ No newline at end of file diff --git a/samples/DatabaseErrorPageSample/project.json b/samples/DatabaseErrorPageSample/project.json index fcac2ba95b..fad7c8df93 100644 --- a/samples/DatabaseErrorPageSample/project.json +++ b/samples/DatabaseErrorPageSample/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "EntityFramework.MicrosoftSqlServer": "7.0.0-*", - "EntityFramework.Commands": "7.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "7.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.EntityFrameworkCore.SqlServer": "7.0.0-*", + "Microsoft.EntityFrameworkCore.Commands": "7.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/samples/DeveloperExceptionPageSample/Startup.cs b/samples/DeveloperExceptionPageSample/Startup.cs index c7514055fb..0608fb10d9 100644 --- a/samples/DeveloperExceptionPageSample/Startup.cs +++ b/samples/DeveloperExceptionPageSample/Startup.cs @@ -1,6 +1,6 @@ using System; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; namespace DeveloperExceptionPageSample { diff --git a/samples/DeveloperExceptionPageSample/hosting.json b/samples/DeveloperExceptionPageSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/DeveloperExceptionPageSample/hosting.json +++ b/samples/DeveloperExceptionPageSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/DeveloperExceptionPageSample/project.json b/samples/DeveloperExceptionPageSample/project.json index 88986ca58e..794ac73ec3 100644 --- a/samples/DeveloperExceptionPageSample/project.json +++ b/samples/DeveloperExceptionPageSample/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/samples/ElmPageSample/HelloWorldMiddleware.cs b/samples/ElmPageSample/HelloWorldMiddleware.cs index d51f720b16..70efb8914a 100644 --- a/samples/ElmPageSample/HelloWorldMiddleware.cs +++ b/samples/ElmPageSample/HelloWorldMiddleware.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; namespace ElmPageSample diff --git a/samples/ElmPageSample/Startup.cs b/samples/ElmPageSample/Startup.cs index 23db0508fc..e0cfa4c4e7 100644 --- a/samples/ElmPageSample/Startup.cs +++ b/samples/ElmPageSample/Startup.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/samples/ElmPageSample/hosting.json b/samples/ElmPageSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/ElmPageSample/hosting.json +++ b/samples/ElmPageSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/ElmPageSample/project.json b/samples/ElmPageSample/project.json index 3b0beb96c6..37f1263346 100644 --- a/samples/ElmPageSample/project.json +++ b/samples/ElmPageSample/project.json @@ -1,9 +1,9 @@ { "exclude": "wwwroot/**/*.*", "dependencies": { - "Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Diagnostics.Elm": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/samples/ExceptionHandlerSample/Startup.cs b/samples/ExceptionHandlerSample/Startup.cs index 5b0b0afe13..6202a0d9ed 100644 --- a/samples/ExceptionHandlerSample/Startup.cs +++ b/samples/ExceptionHandlerSample/Startup.cs @@ -1,10 +1,10 @@ using System; using System.Text.Encodings.Web; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; namespace ExceptionHandlerSample { diff --git a/samples/ExceptionHandlerSample/hosting.json b/samples/ExceptionHandlerSample/hosting.json index 95505372fa..26fd5141aa 100644 --- a/samples/ExceptionHandlerSample/hosting.json +++ b/samples/ExceptionHandlerSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } \ No newline at end of file diff --git a/samples/ExceptionHandlerSample/project.json b/samples/ExceptionHandlerSample/project.json index aefc17535f..6e4e8f5546 100644 --- a/samples/ExceptionHandlerSample/project.json +++ b/samples/ExceptionHandlerSample/project.json @@ -1,10 +1,10 @@ { "exclude": "wwwroot/**/*.*", "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNet.StaticFiles": "1.0.0-*" + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.StaticFiles": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/samples/MiddlewareAnalysisSample/Startup.cs b/samples/MiddlewareAnalysisSample/Startup.cs index bce5492b39..602e186947 100644 --- a/samples/MiddlewareAnalysisSample/Startup.cs +++ b/samples/MiddlewareAnalysisSample/Startup.cs @@ -1,8 +1,8 @@ using System; using System.Diagnostics; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DiagnosticAdapter; using Microsoft.Extensions.Logging; @@ -96,19 +96,19 @@ namespace MiddlewareAnaysisSample public class TestDiagnosticListener { - [DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareStarting")] + [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting")] public virtual void OnMiddlewareStarting(HttpContext httpContext, string name) { 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) { Console.WriteLine($"MiddlewareException: {name}; {exception.Message}"); } - [DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareFinished")] + [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished")] public virtual void OnMiddlewareFinished(HttpContext httpContext, string name) { Console.WriteLine($"MiddlewareFinished: {name}; {httpContext.Response.StatusCode}"); diff --git a/samples/MiddlewareAnalysisSample/hosting.json b/samples/MiddlewareAnalysisSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/MiddlewareAnalysisSample/hosting.json +++ b/samples/MiddlewareAnalysisSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/MiddlewareAnalysisSample/project.json b/samples/MiddlewareAnalysisSample/project.json index 9cf6facce2..c0cfc9df48 100644 --- a/samples/MiddlewareAnalysisSample/project.json +++ b/samples/MiddlewareAnalysisSample/project.json @@ -1,9 +1,9 @@ { "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.MiddlewareAnalysis": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.MiddlewareAnalysis": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, diff --git a/samples/RuntimeInfoPageSample/Startup.cs b/samples/RuntimeInfoPageSample/Startup.cs index 9d8945650a..f713e37b45 100644 --- a/samples/RuntimeInfoPageSample/Startup.cs +++ b/samples/RuntimeInfoPageSample/Startup.cs @@ -1,6 +1,6 @@ -using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; namespace RuntimeInfoPageSample { diff --git a/samples/RuntimeInfoPageSample/hosting.json b/samples/RuntimeInfoPageSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/RuntimeInfoPageSample/hosting.json +++ b/samples/RuntimeInfoPageSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/RuntimeInfoPageSample/project.json b/samples/RuntimeInfoPageSample/project.json index 11b85e572c..0bfa2deb68 100644 --- a/samples/RuntimeInfoPageSample/project.json +++ b/samples/RuntimeInfoPageSample/project.json @@ -1,9 +1,9 @@ { "exclude": "wwwroot/**/*.*", "dependencies": { - "Microsoft.AspNet.Diagnostics": "", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Diagnostics": "", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/samples/StatusCodePagesSample/Startup.cs b/samples/StatusCodePagesSample/Startup.cs index 8c731268c1..7fc0f9f1c8 100644 --- a/samples/StatusCodePagesSample/Startup.cs +++ b/samples/StatusCodePagesSample/Startup.cs @@ -6,11 +6,11 @@ using System.Net; using System.Text; using System.Text.Encodings.Web; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; namespace StatusCodePagesSample { diff --git a/samples/StatusCodePagesSample/hosting.json b/samples/StatusCodePagesSample/hosting.json index 70173d92bb..a55cb2dcef 100644 --- a/samples/StatusCodePagesSample/hosting.json +++ b/samples/StatusCodePagesSample/hosting.json @@ -1,4 +1,4 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel", +{ + "server": "Microsoft.AspNetCore.Server.Kestrel", "server.urls": "http://localhost:5001/base" } diff --git a/samples/StatusCodePagesSample/project.json b/samples/StatusCodePagesSample/project.json index c68912a5ed..c52ebac03d 100644 --- a/samples/StatusCodePagesSample/project.json +++ b/samples/StatusCodePagesSample/project.json @@ -15,9 +15,9 @@ }, "commands": { "web": "StatusCodePagesSample" }, "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "frameworks": { "dnx451": { }, diff --git a/samples/WelcomePageSample/Startup.cs b/samples/WelcomePageSample/Startup.cs index b1be5b4907..6fe69c2bc0 100644 --- a/samples/WelcomePageSample/Startup.cs +++ b/samples/WelcomePageSample/Startup.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; namespace WelcomePageSample { diff --git a/samples/WelcomePageSample/hosting.json b/samples/WelcomePageSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/WelcomePageSample/hosting.json +++ b/samples/WelcomePageSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json index 62bfc48f79..5bf9b1c32a 100644 --- a/samples/WelcomePageSample/project.json +++ b/samples/WelcomePageSample/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "Microsoft.AspNet.Diagnostics": "", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Diagnostics": "", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs index cd519d1b89..978d5f8058 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { /// /// Describes a failure compiling a specific file. diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs index 2fae1031ec..dc9f65f507 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { /// /// A single diagnostic message. diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs index 1a928baa8f..480dddf74b 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { /// /// Specifies the contract for an exception representing compilation failure. diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs index 8d73aa72d6..23069e3df4 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public interface IExceptionHandlerFeature { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs index edc22b2f1f..d5c709e869 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { /// /// Represents the Status code pages feature. diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs index 690d6aeb32..84edf178e9 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public interface IStatusCodeReExecuteFeature { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs index 16b22fbc1a..abfb78caa5 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { public class ActivityContext { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs index 82e715dcec..afaae82a65 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { /// /// Enables the Elm logging service. diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs index 3774baf3cf..35b19e038e 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Diagnostics.Elm; +using Microsoft.AspNetCore.Diagnostics.Elm; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public static class ElmExtensions { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs index a9eec3705b..0090a693c2 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { public class ElmLogger : ILogger { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs index 4a552270de..a6d71b5e08 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { public class ElmLoggerProvider : ILoggerProvider { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs index 496a6f974c..c395765e1b 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { /// /// Options for ElmMiddleware diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs index d594ddceb0..3acce7f05a 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs @@ -3,14 +3,14 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Diagnostics.Elm.Views; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Diagnostics.Elm.Views; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using System.Linq; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { /// /// Enables viewing logs captured by the . diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs index a2a97a6547..5db3696045 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs @@ -6,7 +6,7 @@ using System.Runtime.Remoting.Messaging; using System.Threading; #endif -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { public class ElmScope { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs index 9a4ab485b1..91fa27a394 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Diagnostics.Elm; +using Microsoft.AspNetCore.Diagnostics.Elm; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs index 08ef7eb1c1..9c5ff2de7e 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { public class ElmStore { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs index fd0de85c91..70281945b4 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs @@ -3,9 +3,9 @@ using System; 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 { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs index 213c711d6b..16a6da4064 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs @@ -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. -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { internal class HttpRequestIdentifierFeature : IHttpRequestIdentifierFeature { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs index 1eba704031..e1484fd242 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { public class LogInfo { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs index 1f57751602..e004ffc5ae 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs @@ -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. using System; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { internal class RequestIdentifier : IDisposable { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs index a55ed90774..101dad091f 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { public class ScopeNode { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs index c58cc469ec..db0a8c8304 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Diagnostics.Elm +namespace Microsoft.AspNetCore.Diagnostics.Elm { /// /// Options for viewing elm logs. diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs index d50bbdc12c..fc989d959e 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNet.Diagnostics.Elm.Views +namespace Microsoft.AspNetCore.Diagnostics.Elm.Views { #line 1 "DetailsPage.cshtml" using System @@ -19,19 +19,19 @@ using System.Linq #line hidden ; #line 4 "DetailsPage.cshtml" -using Microsoft.AspNet.Diagnostics.Elm +using Microsoft.AspNetCore.Diagnostics.Elm #line default #line hidden ; #line 5 "DetailsPage.cshtml" -using Microsoft.AspNet.Diagnostics.Views +using Microsoft.AspNetCore.Diagnostics.Views #line default #line hidden ; #line 6 "DetailsPage.cshtml" -using Microsoft.AspNet.Diagnostics.Elm.Views +using Microsoft.AspNetCore.Diagnostics.Elm.Views #line default #line hidden @@ -44,7 +44,7 @@ using Microsoft.Extensions.Logging ; using System.Threading.Tasks; - public class DetailsPage : Microsoft.AspNet.Diagnostics.Views.BaseView + public class DetailsPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView { #line 10 "DetailsPage.cshtml" diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml index bb80b87f33..dadd8ab18a 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml @@ -1,9 +1,9 @@ -@using System +@using System @using System.Globalization @using System.Linq -@using Microsoft.AspNet.Diagnostics.Elm -@using Microsoft.AspNet.Diagnostics.Views -@using Microsoft.AspNet.Diagnostics.Elm.Views +@using Microsoft.AspNetCore.Diagnostics.Elm +@using Microsoft.AspNetCore.Diagnostics.Views +@using Microsoft.AspNetCore.Diagnostics.Elm.Views @using Microsoft.Extensions.Logging @functions diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs index c824625cf4..19304a5e43 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs @@ -1,6 +1,6 @@ -using System; +using System; -namespace Microsoft.AspNet.Diagnostics.Elm.Views +namespace Microsoft.AspNetCore.Diagnostics.Elm.Views { public class DetailsPageModel { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs index aab5a24948..90ea841262 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNet.Diagnostics.Elm.Views +namespace Microsoft.AspNetCore.Diagnostics.Elm.Views { #line 1 "LogPage.cshtml" using System @@ -25,19 +25,19 @@ using System.Linq #line hidden ; #line 5 "LogPage.cshtml" -using Microsoft.AspNet.Diagnostics.Elm.Views +using Microsoft.AspNetCore.Diagnostics.Elm.Views #line default #line hidden ; #line 6 "LogPage.cshtml" -using Microsoft.AspNet.Diagnostics.Elm +using Microsoft.AspNetCore.Diagnostics.Elm #line default #line hidden ; #line 7 "LogPage.cshtml" -using Microsoft.AspNet.Diagnostics.Views +using Microsoft.AspNetCore.Diagnostics.Views #line default #line hidden @@ -50,7 +50,7 @@ using Microsoft.Extensions.Logging ; using System.Threading.Tasks; - public class LogPage : Microsoft.AspNet.Diagnostics.Views.BaseView + public class LogPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView { #line 11 "LogPage.cshtml" diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml index 218b1cd2ec..a32f8426fb 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml @@ -1,10 +1,10 @@ -@using System +@using System @using System.Collections.Generic @using System.Globalization @using System.Linq -@using Microsoft.AspNet.Diagnostics.Elm.Views -@using Microsoft.AspNet.Diagnostics.Elm -@using Microsoft.AspNet.Diagnostics.Views +@using Microsoft.AspNetCore.Diagnostics.Elm.Views +@using Microsoft.AspNetCore.Diagnostics.Elm +@using Microsoft.AspNetCore.Diagnostics.Views @using Microsoft.Extensions.Logging @functions diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs index 9115cc16b0..f60b04fb44 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; -using Microsoft.AspNet.Http; +using System.Collections.Generic; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Diagnostics.Elm.Views +namespace Microsoft.AspNetCore.Diagnostics.Elm.Views { public class LogPageModel { diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json index c5183d6f9a..4fea91af06 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json @@ -10,7 +10,7 @@ "url": "git://github.com/aspnet/diagnostics" }, "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*" }, "frameworks": { diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/CodeAnnotations.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/CodeAnnotations.cs index 28403d3808..45667b82c4 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/CodeAnnotations.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/CodeAnnotations.cs @@ -99,7 +99,7 @@ namespace JetBrains.Annotations } } -namespace Microsoft.Data.Entity.Relational.Utilities +namespace Microsoft.EntityFrameworkCore.Relational.Utilities { internal sealed class ValidatedNotNullAttribute : Attribute { diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs index 1fc27090b1..4e9cc0a323 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using JetBrains.Annotations; -using Microsoft.AspNet.Diagnostics.Entity.Utilities; -using Microsoft.Data.Entity.Storage; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities; +using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.Logging; using System; #if DOTNET5_4 @@ -12,7 +12,7 @@ using System.Threading; using System.Runtime.Remoting.Messaging; #endif -namespace Microsoft.AspNet.Diagnostics.Entity +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore { public class DataStoreErrorLogger : ILogger { diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLoggerProvider.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLoggerProvider.cs index 2dcd6b8b35..3af3d6ecac 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLoggerProvider.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLoggerProvider.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Diagnostics.Entity +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore { public class DataStoreErrorLoggerProvider : ILoggerProvider { diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs index 9e08330fa2..958380496d 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Diagnostics.Entity; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// extension methods for the . diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs index 8ee98c3485..90cc7ee4c7 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs @@ -5,18 +5,18 @@ using System; using System.Linq; using System.Threading.Tasks; using JetBrains.Annotations; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Entity.Utilities; -using Microsoft.AspNet.Diagnostics.Entity.Views; -using Microsoft.AspNet.Http; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Storage; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views; +using Microsoft.AspNetCore.Http; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Diagnostics.Entity +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore { /// /// Captures synchronous and asynchronous database related exceptions from the pipeline that may be resolved using Entity Framework diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs index cd3f0d6c49..38d89e2284 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Diagnostics.Entity; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Options for the . diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs index 4d4cc03973..24ac1dc44a 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Diagnostics.Entity; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// extension methods for the . diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs index 079c8b23b9..794ebde88a 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs @@ -5,14 +5,14 @@ using System; using System.Net; using System.Threading.Tasks; using JetBrains.Annotations; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Entity.Utilities; -using Microsoft.AspNet.Http; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities; +using Microsoft.AspNetCore.Http; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Diagnostics.Entity +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore { /// /// Processes requests to execute migrations operations. The middleware will listen for requests to the path configured in the supplied options. diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs index 87c17d7423..a26e897993 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs @@ -1,10 +1,10 @@ // 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. -using Microsoft.AspNet.Diagnostics.Entity; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Options for the . diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs index 7e45413e95..f0b3e7d9c2 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.Diagnostics.Entity +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity internal static class Strings { 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); /// /// The string argument '{argumentName}' cannot be empty. diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Utilities/Check.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Utilities/Check.cs index 9fda135d4c..c293ab3637 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Utilities/Check.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Utilities/Check.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using JetBrains.Annotations; -namespace Microsoft.AspNet.Diagnostics.Entity.Utilities +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities { [DebuggerStepThrough] internal static class Check diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cs index 97797646bd..a8cccfa96e 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNet.Diagnostics.Entity.Views +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views { #line 1 "DatabaseErrorPage.cshtml" using System @@ -13,20 +13,20 @@ using System.Linq #line hidden ; #line 3 "DatabaseErrorPage.cshtml" -using Microsoft.AspNet.Diagnostics.Entity +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore #line default #line hidden ; #line 4 "DatabaseErrorPage.cshtml" -using Microsoft.AspNet.Diagnostics.Entity.Views +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views #line default #line hidden ; using System.Threading.Tasks; - public class DatabaseErrorPage : Microsoft.AspNet.Diagnostics.Views.BaseView + public class DatabaseErrorPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView { #line 11 "DatabaseErrorPage.cshtml" diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml index 109d1ce663..a75e67dfb0 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml @@ -1,7 +1,7 @@ -@using System +@using System @using System.Linq -@using Microsoft.AspNet.Diagnostics.Entity -@using Microsoft.AspNet.Diagnostics.Entity.Views +@using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore +@using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views @{ Response.StatusCode = 500; Response.ContentType = "text/html"; diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs index 983ccda7fa..fecb511a38 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using JetBrains.Annotations; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Entity.Utilities; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities; using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Diagnostics.Entity.Views +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views { public class DatabaseErrorPageModel { diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json index cca84f7c7b..8f05b0d029 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json @@ -10,8 +10,8 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "EntityFramework.Relational": "7.0.0-*" + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", + "Microsoft.EntityFrameworkCore.Relational": "7.0.0-*" }, "compile": [ "..\\Shared\\*.cs" diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs index d399e30d2f..6ef0f6dfe1 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Diagnostics; +using Microsoft.AspNetCore.Diagnostics; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// extension methods for the . diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs index 03860ee12e..f5fa008c52 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs @@ -9,16 +9,16 @@ using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Views; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.Views; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; 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 { /// /// 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); - 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; diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs index daf4943ad6..2562dbc3b8 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Diagnostics; +using Microsoft.AspNetCore.Diagnostics; using Microsoft.Extensions.FileProviders; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Options for the . diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs index 62b0ab7979..17cf4f3881 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Builder; +using Microsoft.AspNetCore.Builder; -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { /// /// Holds data to be displayed on the compilation error page. diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs index 95ac56b327..8eb05f9b71 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { #line 1 "CompilationErrorPage.cshtml" using System @@ -25,14 +25,14 @@ using System.Net #line hidden ; #line 5 "CompilationErrorPage.cshtml" -using Microsoft.AspNet.Diagnostics +using Microsoft.AspNetCore.Diagnostics #line default #line hidden ; using System.Threading.Tasks; - public class CompilationErrorPage : Microsoft.AspNet.Diagnostics.Views.BaseView + public class CompilationErrorPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView { #line 7 "CompilationErrorPage.cshtml" diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml index db1fd3c613..99eca89e66 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml @@ -1,8 +1,8 @@ -@using System +@using System @using System.Globalization @using System.Linq @using System.Net -@using Microsoft.AspNet.Diagnostics +@using Microsoft.AspNetCore.Diagnostics @functions { public CompilationErrorPageModel Model { get; set; } diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs index 0ab1f14e81..983669c689 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { /// /// Contains details for individual exception messages. diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs index 555ae89965..84a46453e2 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { #line 1 "ErrorPage.cshtml" using System @@ -25,20 +25,20 @@ using System.Net #line hidden ; #line 5 "ErrorPage.cshtml" -using Microsoft.AspNet.Diagnostics.Views +using Microsoft.AspNetCore.Diagnostics.Views #line default #line hidden ; #line 6 "ErrorPage.cshtml" -using Microsoft.AspNet.Diagnostics +using Microsoft.AspNetCore.Diagnostics #line default #line hidden ; using System.Threading.Tasks; - public class ErrorPage : Microsoft.AspNet.Diagnostics.Views.BaseView + public class ErrorPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView { #line 8 "ErrorPage.cshtml" diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml index a43a95f806..7c13371cd3 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml @@ -1,9 +1,9 @@ -@using System +@using System @using System.Globalization @using System.Linq @using System.Net -@using Microsoft.AspNet.Diagnostics.Views -@using Microsoft.AspNet.Diagnostics +@using Microsoft.AspNetCore.Diagnostics.Views +@using Microsoft.AspNetCore.Diagnostics @functions { public ErrorPage(ErrorPageModel model) diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs index acb949afd0..b5150c78fa 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { /// /// Holds data to be displayed on the error page. diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs index 55a3d56b61..1947f162b8 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { /// /// Detailed exception stack information used to generate a view diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs index 154f533036..92f3c35765 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Diagnostics; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Diagnostics; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public static class ExceptionHandlerExtensions { diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs index 1b841962d6..e4a9040c81 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class ExceptionHandlerFeature : IExceptionHandlerFeature { diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs index 4952efcd0b..b27d6ec00c 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs @@ -4,13 +4,13 @@ using System; using System.Diagnostics; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class ExceptionHandlerMiddleware { @@ -71,9 +71,9 @@ namespace Microsoft.AspNet.Diagnostics 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. diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs index 44f9656a7f..65a2fb81e7 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public class ExceptionHandlerOptions { diff --git a/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs index 471d743146..b76bbd3bfe 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Resources; 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: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs index 48c35f0b03..1e33a9e9f9 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Diagnostics internal static class Resources { 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); /// /// You are seeing this page because DiagnosticsPageMiddleware was added to your web application. diff --git a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs index 6e9ce60643..daa470bd5f 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Diagnostics; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Diagnostics; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using Microsoft.Extensions.PlatformAbstractions; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public static class RuntimeInfoExtensions { diff --git a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs index e13619aa92..518ca33efe 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs @@ -3,13 +3,13 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Views; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.Views; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using Microsoft.Extensions.PlatformAbstractions; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { /// /// Displays information about the packages used by the application at runtime diff --git a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs index c49fad144a..f2d1b3cd8b 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Options for the RuntimeInfoPage diff --git a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs index b385ad39ed..0f30279bd5 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { #line 1 "RuntimeInfoPage.cshtml" using System @@ -19,13 +19,13 @@ using System.Linq #line hidden ; #line 4 "RuntimeInfoPage.cshtml" -using Microsoft.AspNet.Diagnostics +using Microsoft.AspNetCore.Diagnostics #line default #line hidden ; #line 5 "RuntimeInfoPage.cshtml" -using Microsoft.AspNet.Diagnostics.Views +using Microsoft.AspNetCore.Diagnostics.Views #line default #line hidden @@ -37,7 +37,7 @@ using Microsoft.Extensions.PlatformAbstractions; #line hidden using System.Threading.Tasks; - public class RuntimeInfoPage : Microsoft.AspNet.Diagnostics.Views.BaseView + public class RuntimeInfoPage : Microsoft.AspNetCore.Diagnostics.Views.BaseView { #line 9 "RuntimeInfoPage.cshtml" diff --git a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml index 23d8fb07d5..d90bf3344b 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml +++ b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml @@ -1,8 +1,8 @@ -@using System +@using System @using System.Globalization @using System.Linq -@using Microsoft.AspNet.Diagnostics -@using Microsoft.AspNet.Diagnostics.Views +@using Microsoft.AspNetCore.Diagnostics +@using Microsoft.AspNetCore.Diagnostics.Views @using Microsoft.Extensions.PlatformAbstractions; @functions diff --git a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs index 04705bfc20..a61620cdae 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { public class RuntimeInfoPageModel { diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs index f9ea047def..849aee6994 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class StatusCodeContext { diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs index ca9c591731..dbc753399c 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs @@ -4,11 +4,11 @@ using System; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Diagnostics; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Diagnostics; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public static class StatusCodePagesExtensions { diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs index 028129d626..093ca59521 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { /// /// Represents the Status code pages feature. diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs index 6efbf31c98..fca9e4dec7 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs @@ -3,11 +3,11 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class StatusCodePagesMiddleware { diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs index 3889e3dcae..37a8b92360 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs @@ -4,11 +4,11 @@ using System; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Diagnostics; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.WebUtilities; +using Microsoft.AspNetCore.Diagnostics; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.WebUtilities; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Options for StatusCodePagesMiddleware. diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs index efa1b53f2a..fb95e02396 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class StatusCodeReExecuteFeature : IStatusCodeReExecuteFeature { diff --git a/src/Microsoft.AspNetCore.Diagnostics/Views/AttributeValue.cs b/src/Microsoft.AspNetCore.Diagnostics/Views/AttributeValue.cs index 6a619a67da..b54a67d7fd 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Views/AttributeValue.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/Views/AttributeValue.cs @@ -1,6 +1,6 @@ -using System; +using System; -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { public class AttributeValue { diff --git a/src/Microsoft.AspNetCore.Diagnostics/Views/BaseView.cs b/src/Microsoft.AspNetCore.Diagnostics/Views/BaseView.cs index f8c122ea03..fc811bdb14 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Views/BaseView.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/Views/BaseView.cs @@ -11,9 +11,9 @@ using System.Linq; using System.Text; using System.Text.Encodings.Web; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { /// /// Infrastructure diff --git a/src/Microsoft.AspNetCore.Diagnostics/Views/HelperResult.cs b/src/Microsoft.AspNetCore.Diagnostics/Views/HelperResult.cs index c0a7ff059e..fa408f4baf 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Views/HelperResult.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/Views/HelperResult.cs @@ -4,7 +4,7 @@ using System; using System.IO; -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { /// /// Represents a deferred write operation in a . diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs index 37bef42064..68cb621d5a 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNet.Diagnostics.Views +namespace Microsoft.AspNetCore.Diagnostics.Views { #line 1 "WelcomePage.cshtml" using System @@ -7,14 +7,14 @@ using System #line hidden ; #line 2 "WelcomePage.cshtml" -using Microsoft.AspNet.Diagnostics +using Microsoft.AspNetCore.Diagnostics #line default #line hidden ; using System.Threading.Tasks; - public class WelcomePage : Microsoft.AspNet.Diagnostics.Views.BaseView + public class WelcomePage : Microsoft.AspNetCore.Diagnostics.Views.BaseView { #line hidden public WelcomePage() diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml index 9f560e1864..9cfb311cbd 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml +++ b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml @@ -1,5 +1,5 @@ -@using System -@using Microsoft.AspNet.Diagnostics +@using System +@using Microsoft.AspNetCore.Diagnostics @{ Response.ContentType = "text/html"; } diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs index ccbb59dafc..67b967c139 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs @@ -3,11 +3,11 @@ using System; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Diagnostics; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Diagnostics; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// IApplicationBuilder extensions for the WelcomePageMiddleware. diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs index dc2ee33a01..623d2b1302 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs @@ -4,12 +4,12 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Views; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.Views; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { /// /// This middleware provides a default web page for new applications. diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs index 4d5896a240..a62cea951b 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs @@ -2,9 +2,9 @@ // 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 { /// /// Options for the WelcomePageMiddleware. diff --git a/src/Microsoft.AspNetCore.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json index 07fc920c96..ebaf53ca7e 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics/project.json @@ -10,9 +10,9 @@ "url": "git://github.com/aspnet/diagnostics" }, "dependencies": { - "Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*", - "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.AspNet.WebUtilities": "1.0.0-*", + "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", + "Microsoft.AspNetCore.WebUtilities": "1.0.0-*", "Microsoft.Extensions.FileProviders.Physical": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Options": "1.0.0-*", diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs index ca4f2c360d..f26ca9926a 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs @@ -1,13 +1,13 @@ -// 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. using System; using System.Collections.Generic; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNet.MiddlewareAnalysis +namespace Microsoft.AspNetCore.MiddlewareAnalysis { public class AnalysisBuilder : IApplicationBuilder { diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs index 79bb52d81b..d4116a22fa 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs @@ -1,12 +1,12 @@ -// 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. using System; using System.Diagnostics; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.MiddlewareAnalysis +namespace Microsoft.AspNetCore.MiddlewareAnalysis { public class AnalysisMiddleware { @@ -27,25 +27,25 @@ namespace Microsoft.AspNet.MiddlewareAnalysis public async Task Invoke(HttpContext httpContext) { - if (_diagnostics.IsEnabled("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareStarting")) + if (_diagnostics.IsEnabled("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting")) { - _diagnostics.Write("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareStarting", new { name = _middlewareName, httpContext = httpContext }); + _diagnostics.Write("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting", new { name = _middlewareName, httpContext = httpContext }); } try { await _next(httpContext); - if (_diagnostics.IsEnabled("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareFinished")) + if (_diagnostics.IsEnabled("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished")) { - _diagnostics.Write("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareFinished", new { name = _middlewareName, httpContext = httpContext }); + _diagnostics.Write("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished", new { name = _middlewareName, httpContext = httpContext }); } } catch (Exception ex) { - if (_diagnostics.IsEnabled("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareException")) + if (_diagnostics.IsEnabled("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException")) { - _diagnostics.Write("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareException", new { name = _middlewareName, httpContext = httpContext, exception = ex }); + _diagnostics.Write("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException", new { name = _middlewareName, httpContext = httpContext, exception = ex }); } throw; } diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs index c337c959a8..2bfeeaa41b 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs @@ -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. -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.MiddlewareAnalysis; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.MiddlewareAnalysis; using Microsoft.Extensions.DependencyInjection.Extensions; namespace Microsoft.Extensions.DependencyInjection diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs index edb092c918..ffce35a667 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; -namespace Microsoft.AspNet.MiddlewareAnalysis +namespace Microsoft.AspNetCore.MiddlewareAnalysis { public class AnalysisStartupFilter : IStartupFilter { diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj index 7b0842ca52..a3e1e87bea 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ c2dedd37-d1eb-4819-9a9c-475e37a52358 - Microsoft.AspNet.MiddlewareAnalysis + Microsoft.AspNetCore.MiddlewareAnalysis ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json index b1c131eb8e..25ce87744e 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json @@ -10,7 +10,7 @@ "url": "git://github.com/aspnet/diagnostics" }, "dependencies": { - "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", "System.Diagnostics.DiagnosticSource": "4.0.0-*" }, diff --git a/src/PageGenerator/Program.cs b/src/PageGenerator/Program.cs index c2bdda7df0..a23098db62 100644 --- a/src/PageGenerator/Program.cs +++ b/src/PageGenerator/Program.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.AspNet.Razor; -using Microsoft.AspNet.Razor.CodeGenerators; +using Microsoft.AspNetCore.Razor; +using Microsoft.AspNetCore.Razor.CodeGenerators; namespace PageGenerator { @@ -61,7 +61,7 @@ namespace PageGenerator var fileNameNoExtension = Path.GetFileNameWithoutExtension(fileName); var codeLang = new CSharpRazorCodeLanguage(); var host = new RazorEngineHost(codeLang); - host.DefaultBaseClass = "Microsoft.AspNet.Diagnostics.Views.BaseView"; + host.DefaultBaseClass = "Microsoft.AspNetCore.Diagnostics.Views.BaseView"; host.GeneratedClassContext = new GeneratedClassContext( executeMethodName: GeneratedClassContext.DefaultExecuteMethodName, writeMethodName: GeneratedClassContext.DefaultWriteMethodName, diff --git a/src/PageGenerator/project.json b/src/PageGenerator/project.json index 5682586455..5be283fcf1 100644 --- a/src/PageGenerator/project.json +++ b/src/PageGenerator/project.json @@ -10,7 +10,7 @@ "url": "git://github.com/aspnet/diagnostics" }, "dependencies": { - "Microsoft.AspNet.Razor": "4.0.0-*" + "Microsoft.AspNetCore.Razor": "4.0.0-*" }, "frameworks": { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index 892cd76156..3827af5d85 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs @@ -9,20 +9,20 @@ using System.Net; using System.Net.Http; using System.Text.Encodings.Web; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Helpers; -using Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.TestHost; -using Microsoft.AspNet.Testing.xunit; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Helpers; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.Helpers; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.TestHost; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class DatabaseErrorPageMiddlewareTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/PlatformHelper.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/PlatformHelper.cs index 71452c237a..b05aacb836 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/PlatformHelper.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/PlatformHelper.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Helpers +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Helpers { public class PlatformHelper { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs index 54e7ddeb7f..86a3d6c284 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs @@ -5,7 +5,7 @@ using System; using Microsoft.Extensions.Logging; using System.Collections.Generic; -namespace Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Helpers +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Helpers { public class TestLoggerProvider : ILoggerProvider { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs index a0a6887abf..af90453c47 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs @@ -7,20 +7,20 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.TestHost; -using Microsoft.AspNet.Testing.xunit; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Storage; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.Helpers; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.TestHost; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class MigrationsEndPointMiddlewareTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/SqlServerTestStore.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/SqlServerTestStore.cs index bd3da2e638..e6fbcff6cb 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/SqlServerTestStore.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/SqlServerTestStore.cs @@ -4,10 +4,10 @@ using System; using System.Data.SqlClient; using System.Threading; -using Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Helpers; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Helpers; +using Microsoft.EntityFrameworkCore; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class SqlServerTestStore : IDisposable { @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public static SqlServerTestStore CreateScratch() { - var name = "Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Scratch_" + Interlocked.Increment(ref _scratchCount); + var name = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Scratch_" + Interlocked.Increment(ref _scratchCount); var db = new SqlServerTestStore(name); return db; } diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/Blog.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/Blog.cs index bd75c67b52..3861146450 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/Blog.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/Blog.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class Blog { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContext.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContext.cs index d8b96f7b96..a62c88fd6a 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContext.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContext.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class BloggingContext : DbContext { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs index d340179788..82a046202f 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class BloggingContextWithMigrations : BloggingContext { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs index 70e955e8e9..6209544304 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class BloggingContextWithPendingModelChanges : BloggingContext { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs index 72a183f708..d3488ae580 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class BloggingContextWithSnapshotThatThrows : BloggingContext { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json index c67c2a6c3f..aeb9c472ff 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "EntityFramework.MicrosoftSqlServer": "7.0.0-*", - "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", - "Microsoft.AspNet.Diagnostics.Entity.Tests": "1.0.0", - "Microsoft.AspNet.TestHost": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.EntityFrameworkCore.SqlServer": "7.0.0-*", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "7.0.0-*", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests": "1.0.0", + "Microsoft.AspNetCore.TestHost": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.1.0" }, "testRunner": "xunit", diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTest.cs index 363b8571b4..32f7f0750e 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTest.cs @@ -1,12 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Diagnostics.Entity; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using System.Reflection; -namespace Microsoft.AspNet.Diagnostics.EntityTests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCoreTests { public class ApiConsistencyTest : ApiConsistencyTestBase { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTestBase.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTestBase.cs index d00b51df60..ac5ef876dc 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTestBase.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTestBase.cs @@ -7,11 +7,11 @@ using System.Linq; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Diagnostics.Entity.Views; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.Data.Entity +namespace Microsoft.EntityFrameworkCore { public abstract class ApiConsistencyTestBase { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs index 4b95acbfb0..842c5f14a7 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Builder; +using Microsoft.AspNetCore.Builder; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class DatabaseErrorPageOptionsTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs index 5f8889e57a..4a05483360 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers; -using Microsoft.AspNet.Diagnostics.Entity.Views; -using Microsoft.AspNet.Http; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.Helpers; +using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views; +using Microsoft.AspNetCore.Http; +using Microsoft.EntityFrameworkCore; using Moq; using System; using System.IO; @@ -13,7 +13,7 @@ using System.Text; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { public class DatabaseErrorPageTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs index 962e55b58d..80d8b45e18 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs @@ -4,7 +4,7 @@ using System; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.Helpers { public static class AssertHelpers { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs index 89d9475eee..68d7d3392e 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs @@ -5,13 +5,13 @@ using System; using System.Linq; using System.Reflection; -namespace Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers +namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.Helpers { public class StringsHelpers { public static string GetResourceString(string stringName, params object[] parameters) { - var strings = typeof(DatabaseErrorPageMiddleware).GetTypeInfo().Assembly.GetType("Microsoft.AspNet.Diagnostics.Entity.Strings").GetTypeInfo(); + var strings = typeof(DatabaseErrorPageMiddleware).GetTypeInfo().Assembly.GetType("Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Strings").GetTypeInfo(); var method = strings.GetDeclaredMethods(stringName).Single(); return (string)method.Invoke(null, parameters); } diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs index c430e8ea1b..d101ba3665 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.Data.Entity.Tests +namespace Microsoft.EntityFrameworkCore.Tests { public static class TestHelperExtensions { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json index 4a3dddbc7d..d3304201ed 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json @@ -3,9 +3,9 @@ "warningsAsErrors": true }, "dependencies": { - "EntityFramework.InMemory": "7.0.0-*", - "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.EntityFrameworkCore.InMemory": "7.0.0-*", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "7.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.1.0" }, "compile": [ "../Shared/ApiConsistencyTestBase.cs", "../Shared/TestHelpers.cs" ], diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs index 57a0666deb..a09a36e909 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs @@ -11,10 +11,10 @@ using System.Runtime.Versioning; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.TestHost; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.TestHost; +using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; @@ -22,9 +22,9 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; using Xunit; -using StackFrame = Microsoft.AspNet.Diagnostics.Views.StackFrame; +using StackFrame = Microsoft.AspNetCore.Diagnostics.Views.StackFrame; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class DeveloperExceptionPageMiddlewareTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs index fcc70073f5..c720cd9251 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs @@ -5,11 +5,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using Microsoft.AspNet.Diagnostics.Elm; +using Microsoft.AspNetCore.Diagnostics.Elm; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Tests +namespace Microsoft.AspNetCore.Diagnostics.Tests { public class ElmLoggerTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs index 4e30b22ff5..e7ee6c9950 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs @@ -6,18 +6,18 @@ using System.IO; using System.Security.Claims; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Diagnostics.Elm; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Features.Internal; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.Elm; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Features.Internal; +using Microsoft.AspNetCore.Http.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Tests +namespace Microsoft.AspNetCore.Diagnostics.Tests { public class ElmMiddlewareTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs index f36ffc3e05..d95a8fe0c9 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs @@ -1,4 +1,4 @@ -// 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. using System; @@ -9,14 +9,14 @@ using System.Linq; using System.Net; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class ExceptionHandlerTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs index fc64acf582..6f712c2dc2 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs @@ -4,14 +4,14 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using Microsoft.Extensions.PlatformAbstractions; using Moq; using Xunit; -namespace Microsoft.AspNet.Diagnostics.Tests +namespace Microsoft.AspNetCore.Diagnostics.Tests { public class RuntimeInfoMiddlewareTest { diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs index 86be50ee15..1d8e036ef9 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs @@ -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. using Microsoft.Extensions.DiagnosticAdapter; -namespace Microsoft.AspNet.Diagnostics +namespace Microsoft.AspNetCore.Diagnostics { public class TestDiagnosticListener { @@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Diagnostics public OnExceptionEventData DiagnosticUnhandledException { get; set; } public OnExceptionEventData DiagnosticHandledException { get; set; } - [DiagnosticName("Microsoft.AspNet.Hosting.BeginRequest")] + [DiagnosticName("Microsoft.AspNetCore.Hosting.BeginRequest")] public virtual void OnBeginRequest(IProxyHttpContext httpContext) { BeginRequest = new OnRequestEventData() @@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Diagnostics }; } - [DiagnosticName("Microsoft.AspNet.Hosting.EndRequest")] + [DiagnosticName("Microsoft.AspNetCore.Hosting.EndRequest")] public virtual void OnEndRequest(IProxyHttpContext httpContext) { EndRequest = new OnRequestEventData() @@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Diagnostics }; } - [DiagnosticName("Microsoft.AspNet.Hosting.UnhandledException")] + [DiagnosticName("Microsoft.AspNetCore.Hosting.UnhandledException")] public virtual void OnHostingUnhandledException(IProxyHttpContext httpContext, IProxyException exception) { HostingUnhandledException = new OnExceptionEventData() @@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Diagnostics }; } - [DiagnosticName("Microsoft.AspNet.Diagnostics.UnhandledException")] + [DiagnosticName("Microsoft.AspNetCore.Diagnostics.UnhandledException")] public virtual void OnDiagnosticUnhandledException(IProxyHttpContext httpContext, IProxyException exception) { DiagnosticUnhandledException = new OnExceptionEventData() @@ -62,7 +62,7 @@ namespace Microsoft.AspNet.Diagnostics }; } - [DiagnosticName("Microsoft.AspNet.Diagnostics.HandledException")] + [DiagnosticName("Microsoft.AspNetCore.Diagnostics.HandledException")] public virtual void OnDiagnosticHandledException(IProxyHttpContext httpContext, IProxyException exception) { DiagnosticHandledException = new OnExceptionEventData() diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json index 57af1e39e2..daf345e987 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json @@ -4,9 +4,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*", - "Microsoft.AspNet.TestHost": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Diagnostics.Elm": "1.0.0-*", + "Microsoft.AspNetCore.TestHost": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*", diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj index 5207d14faf..73b3c310d9 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj @@ -1,4 +1,4 @@ - + 14.0.23107 @@ -7,7 +7,7 @@ b0166aed-738f-42ee-af4d-c487c8b21521 - Microsoft.AspNet.MiddlewareAnalysis.Tests + Microsoft.AspNetCore.MiddlewareAnalysis.Tests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs index dfcff9659c..56a78f2417 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs @@ -1,16 +1,16 @@ -// 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. using System; using System.Diagnostics; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Microsoft.AspNet.MiddlewareAnalysis +namespace Microsoft.AspNetCore.MiddlewareAnalysis { public class MiddlewareAnalysisTests { @@ -39,15 +39,15 @@ namespace Microsoft.AspNet.MiddlewareAnalysis await server.CreateClient().GetAsync(string.Empty); // "Microsoft.AspnNet.Hosting.RequestServicesContainerMiddleware","Microsoft.AspnNet.Diagnostics.DeveloperExceptionPageMiddleware", - // "Microsoft.AspNet.MiddlewareAnalysis.MiddlewareAnalysisTests.+<>c" + // "Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareAnalysisTests.+<>c" Assert.Equal(3, listener.MiddlewareStarting.Count); - Assert.Equal("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareAnalysisTests+<>c", listener.MiddlewareStarting[2]); + Assert.Equal("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareAnalysisTests+<>c", listener.MiddlewareStarting[2]); // reversed "RunInlineMiddleware" Assert.Equal(1, listener.MiddlewareException.Count); - Assert.Equal("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareAnalysisTests+<>c", listener.MiddlewareException[0]); + Assert.Equal("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareAnalysisTests+<>c", listener.MiddlewareException[0]); // reversed "Microsoft.AspnNet.Diagnostics.DeveloperExceptionPageMiddleware","Microsoft.AspnNet.Hosting.RequestServicesContainerMiddleware" Assert.Equal(2, listener.MiddlewareFinished.Count); - Assert.Equal("Microsoft.AspNet.Diagnostics.DeveloperExceptionPageMiddleware", listener.MiddlewareFinished[0]); + Assert.Equal("Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware", listener.MiddlewareFinished[0]); } } } diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs index 035b106648..ef171aff35 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs @@ -1,12 +1,12 @@ -// 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. using System; using System.Collections.Generic; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DiagnosticAdapter; -namespace Microsoft.AspNet.MiddlewareAnalysis +namespace Microsoft.AspNetCore.MiddlewareAnalysis { public class TestDiagnosticListener { @@ -14,19 +14,19 @@ namespace Microsoft.AspNet.MiddlewareAnalysis public IList MiddlewareFinished { get; } = new List(); public IList MiddlewareException { get; } = new List(); - [DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareStarting")] + [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting")] public virtual void OnMiddlewareStarting(HttpContext httpContext, string name) { MiddlewareStarting.Add(name); } - [DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareException")] + [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException")] public virtual void OnMiddlewareException(Exception exception, string name) { MiddlewareException.Add(name); } - [DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareFinished")] + [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished")] public virtual void OnMiddlewareFinished(HttpContext httpContext, string name) { MiddlewareFinished.Add(name); diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json index 584042aaaf..55200d9376 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json @@ -3,10 +3,10 @@ "warningsAsErrors": false }, "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.MiddlewareAnalysis": "1.0.0-*", - "Microsoft.AspNet.TestHost": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", + "Microsoft.AspNetCore.MiddlewareAnalysis": "1.0.0-*", + "Microsoft.AspNetCore.TestHost": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", "xunit": "2.1.0"