From ed0b4216951083c61bf9db16cb37ed96b22329df Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 21 Nov 2018 13:54:33 -0800 Subject: [PATCH] Reorganize source code in preparation to move into aspnet/AspNetCore Prior to reorganization, this source code was found in https://github.com/aspnet/Diagnostics/tree/8893337fb090c523843564a91054996bfcc3cc42 --- .appveyor.yml | 17 - .gitattributes | 52 - .github/ISSUE_TEMPLATE.md | 3 - .gitignore | 38 - .travis.yml | 27 - CONTRIBUTING.md | 4 - DiagnosticsPages.sln | 380 --- Directory.Build.props | 21 - Directory.Build.targets | 7 - LICENSE.txt | 14 - NuGet.config | 7 - NuGetPackageVerifier.json | 7 - README.md | 11 - build.cmd | 2 - build.sh | 8 - build/Key.snk | Bin 596 -> 0 bytes build/dependencies.props | 52 - build/repo.props | 18 - build/sources.props | 17 - korebuild-lock.txt | 2 - korebuild.json | 4 - run.cmd | 2 - run.ps1 | 196 -- run.sh | 231 -- .../DatabaseErrorPageSample.csproj | 18 - .../DeveloperExceptionPageSample.csproj | 16 - samples/ElmPageSample/ElmPageSample.csproj | 15 - samples/ElmPageSample/HelloWorldMiddleware.cs | 34 - samples/ElmPageSample/Startup.cs | 42 - .../ExceptionHandlerSample.csproj | 17 - .../ExceptionHandlerSample/wwwroot/error.html | 12 - .../HealthChecksSample.csproj | 17 - .../MiddlewareAnalysisSample.csproj | 19 - .../StatusCodePagesSample.csproj | 16 - .../WelcomePageSample.csproj | 16 - samples/WelcomePageSample/web.config | 9 - src/Directory.Build.props | 7 - .../ActivityContext.cs | 20 - .../ElmCaptureMiddleware.cs | 71 - .../ElmExtensions.cs | 47 - .../ElmLogger.cs | 82 - .../ElmLoggerProvider.cs | 40 - .../ElmOptions.cs | 26 - .../ElmPageMiddleware.cs | 127 - .../ElmScope.cs | 96 - .../ElmServiceCollectionExtensions.cs | 58 - .../ElmStore.cs | 119 - .../HttpInfo.cs | 36 - .../HttpRequestIdentifierFeature.cs | 12 - .../LogInfo.cs | 27 - ...icrosoft.AspNetCore.Diagnostics.Elm.csproj | 26 - .../RequestIdentifier.cs | 57 - .../ScopeNode.cs | 23 - .../ViewOptions.cs | 23 - .../Views/DetailsPage.Designer.cs | 541 ---- .../Views/DetailsPage.cshtml | 260 -- .../Views/DetailsPage.css | 56 - .../Views/DetailsPageModel.cs | 11 - .../Views/LogPage.Designer.cs | 651 ----- .../Views/LogPage.cshtml | 267 -- .../Views/LogPage.css | 110 - .../Views/LogPageModel.cs | 14 - .../Views/Obsolete/DetailsPage.cs | 512 ---- .../Views/Obsolete/DetailsPage.cshtml | 258 -- .../Views/Obsolete/DetailsPage.css | 56 - .../Views/Obsolete/DetailsPageModel.cs | 12 - .../Views/Obsolete/LogPage.cs | 579 ---- .../Views/Obsolete/LogPage.cshtml | 263 -- .../Views/Obsolete/LogPage.css | 110 - .../Views/Obsolete/LogPageModel.cs | 16 - .../Views/Obsolete/Shared.css | 39 - .../Views/Shared.css | 39 - .../baseline.netcore.json | 2347 ----------------- .../HealthCheckAppBuilderExtensions.cs | 32 - .../HealthCheckMiddleware.cs | 79 - .../HealthCheckOptions.cs | 18 - ...AspNetCore.Diagnostics.HealthChecks.csproj | 28 - .../baseline.netcore.json | 115 - .../Microsoft.AspNetCore.Diagnostics.csproj | 33 - .../HealthCheckResult.cs | 188 -- .../HealthCheckStatus.cs | 41 - .../IHealthCheck.cs | 27 - ...agnostics.HealthChecks.Abstractions.csproj | 16 - .../baseline.netcore.json | 377 --- .../CompositeHealthCheckResult.cs | 66 - .../HealthCheck.cs | 41 - .../HealthCheckLogScope.cs | 48 - .../HealthCheckService.cs | 132 - .../HealthCheckServiceCollectionExtensions.cs | 31 - .../HealthChecksBuilder.cs | 17 - .../HealthChecksBuilderAddCheckExtensions.cs | 39 - .../IHealthCheckService.cs | 46 - .../IHealthChecksBuilder.cs | 22 - ...Extensions.Diagnostics.HealthChecks.csproj | 21 - .../baseline.netcore.json | 334 --- .../src}/CompilationFailure.cs | 0 .../src}/DiagnosticMessage.cs | 0 .../src}/ICompilationException.cs | 0 .../src}/IExceptionHandlerFeature.cs | 0 .../src}/IExceptionHandlerPathFeature.cs | 0 .../src}/IStatusCodePagesFeature.cs | 0 .../src}/IStatusCodeReExecuteFeature.cs | 0 ...AspNetCore.Diagnostics.Abstractions.csproj | 0 .../src}/baseline.netcore.json | 0 .../src}/DatabaseErrorPageExtensions.cs | 0 .../src}/DatabaseErrorPageMiddleware.cs | 0 .../src}/DatabaseErrorPageOptions.cs | 0 ...ticsEntityFrameworkCoreLoggerExtensions.cs | 0 ...ore.Diagnostics.EntityFrameworkCore.csproj | 8 +- .../src}/MigrationsEndPointExtensions.cs | 0 .../src}/MigrationsEndPointMiddleware.cs | 0 .../src}/MigrationsEndPointOptions.cs | 0 .../src}/Properties/AssemblyInfo.cs | 0 .../src}/Properties/Strings.Designer.cs | 0 .../src}/Strings.resx | 0 .../src}/Views/DatabaseErrorPage.Designer.cs | 0 .../src}/Views/DatabaseErrorPage.cshtml | 0 .../src}/Views/DatabaseErrorPageModel.cs | 0 .../src}/Views/ErrorPage.css | 0 .../src}/baseline.netcore.json | 0 .../DatabaseErrorPageMiddlewareTest.cs | 0 .../Diagnostics.EFCore.FunctionalTests.csproj | 16 + .../Helpers/PlatformHelper.cs | 0 .../FunctionalTests}/Helpers/StringHelpers.cs | 0 .../Helpers/TestLoggerProvider.cs | 0 .../MigrationsEndPointMiddlewareTest.cs | 0 .../FunctionalTests}/SqlServerTestStore.cs | 0 .../test/FunctionalTests}/TestModels/Blog.cs | 0 .../TestModels/BloggingContext.cs | 0 .../BloggingContextWithMigrations.cs | 0 .../BloggingContextWithPendingModelChanges.cs | 0 .../BloggingContextWithSnapshotThatThrows.cs | 0 .../DatabaseErrorPageOptionsTest.cs | 0 .../test/UnitTests}/DatabaseErrorPageTest.cs | 0 .../test/UnitTests}/Helpers/AssertHelpers.cs | 0 .../test/UnitTests}/Helpers/StringHelpers.cs | 0 ...agnostics.EntityFrameworkCore.Tests.csproj | 13 + .../test/UnitTests}/TestHelperExtensions.cs | 0 .../Diagnostics/src}/.csslintrc | 0 .../Diagnostics/src}/.jshintrc | 0 .../DeveloperExceptionPageExtensions.cs | 0 .../DeveloperExceptionPageMiddleware.cs | 0 .../DeveloperExceptionPageOptions.cs | 0 .../Views/CompilationErrorModel.cs | 0 .../Views/CompilationErrorPage.Designer.cs | 0 .../Views/CompilationErrorPage.cshtml | 0 .../Views/ErrorPage.Designer.cs | 0 .../Views/ErrorPage.cshtml | 0 .../Views/ErrorPage.css | 0 .../DeveloperExceptionPage/Views/ErrorPage.js | 0 .../Views/ErrorPageModel.cs | 0 .../ExceptionHandlerExtensions.cs | 0 .../ExceptionHandlerFeature.cs | 0 .../ExceptionHandlerMiddleware.cs | 0 .../ExceptionHandlerOptions.cs | 0 .../Internal/DiagnosticsLoggerExtensions.cs | 0 .../Microsoft.AspNetCore.Diagnostics.csproj | 30 + .../src}/Properties/AssemblyInfo.cs | 0 .../src}/Properties/Resources.Designer.cs | 0 .../Diagnostics/src}/Resources.resx | 0 .../src}/StatusCodePage/StatusCodeContext.cs | 0 .../StatusCodePagesExtensions.cs | 0 .../StatusCodePage/StatusCodePagesFeature.cs | 0 .../StatusCodePagesMiddleware.cs | 0 .../StatusCodePage/StatusCodePagesOptions.cs | 0 .../StatusCodeReExecuteFeature.cs | 0 .../WelcomePage/Views/Obsolete/WelcomePage.cs | 0 .../Views/Obsolete/WelcomePage.cshtml | 0 .../WelcomePage/Views/WelcomePage.Designer.cs | 0 .../src}/WelcomePage/Views/WelcomePage.cshtml | 0 .../src}/WelcomePage/WelcomePageExtensions.cs | 0 .../src}/WelcomePage/WelcomePageMiddleware.cs | 0 .../src}/WelcomePage/WelcomePageOptions.cs | 0 .../Diagnostics/src}/_gruntfile.js | 0 .../Diagnostics/src}/_gruntfile.readme | 0 .../Diagnostics/src}/_package.json | 0 .../Diagnostics/src}/baseline.netcore.json | 0 .../DatabaseErrorPageSampleTest.cs | 0 .../DeveloperExceptionPageSampleTest.cs | 0 .../Diagnostics.FunctionalTests.csproj | 25 + .../ExceptionHandlerSampleTest.cs | 0 .../MiddlewareAnalysisSampleTest.cs | 0 .../FunctionalTests}/StatusCodeSampleTest.cs | 0 .../test/FunctionalTests}/TestFixture.cs | 0 .../FunctionalTests}/WelcomePageSampleTest.cs | 0 .../DeveloperExceptionPageMiddlewareTest.cs | 0 .../test/UnitTests}/ElmLoggerTest.cs | 0 .../test/UnitTests}/ElmMiddlewareTest.cs | 0 .../ExceptionDetailsProviderTest.cs | 0 .../test/UnitTests}/ExceptionHandlerTest.cs | 0 ...rosoft.AspNetCore.Diagnostics.Tests.csproj | 34 + .../TestFiles/EmbeddedSourceFile.txt | 0 .../test/UnitTests}/TestDiagnosticListener.cs | 0 .../test/UnitTests}/TestFiles/SourceFile.txt | 0 .../ClassLibraryWithPortablePdbs.csproj | 0 .../ExceptionType.cs | 0 .../DatabaseErrorPageSample.csproj | 18 + .../DatabaseErrorPageSample/Startup.cs | 0 .../DatabaseErrorPageSample/web.config | 0 .../DeveloperExceptionPageSample.csproj | 16 + .../DeveloperExceptionPageSample/Startup.cs | 0 .../DeveloperExceptionPageSample/web.config | 0 .../ExceptionHandlerSample.csproj | 15 + .../ExceptionHandlerSample/Startup.cs | 0 .../ExceptionHandlerSample}/web.config | 0 .../wwwroot/error.html | 0 .../HealthChecksSample.csproj | 14 + .../testassets}/HealthChecksSample/Program.cs | 0 .../testassets}/HealthChecksSample/Startup.cs | 0 .../StatusCodePagesSample/Startup.cs | 0 .../StatusCodePagesSample.csproj | 13 + .../StatusCodePagesSample}/web.config | 0 .../testassets}/WelcomePageSample/Startup.cs | 0 .../WelcomePageSample.csproj | 13 + .../testassets/WelcomePageSample}/web.config | 0 .../MiddlewareAnalysisSample.csproj | 16 + .../MiddlewareAnalysisSample/Startup.cs | 0 .../MiddlewareAnalysisSample}/web.config | 0 .../src}/AnalysisBuilder.cs | 0 .../src}/AnalysisMiddleware.cs | 0 .../AnalysisServiceCollectionExtensions.cs | 0 .../src}/AnalysisStartupFilter.cs | 0 ...osoft.AspNetCore.MiddlewareAnalysis.csproj | 6 +- .../src}/baseline.netcore.json | 0 ...AspNetCore.MiddlewareAnalysis.Tests.csproj | 22 + .../test}/MiddlewareAnalysisTests.cs | 0 .../test}/TestDiagnosticListener.cs | 0 .../Diagnostics}/AttributeValue.cs | 0 .../Diagnostics}/BaseView.cs | 0 src/Shared/Diagnostics/Directory.Build.props | 5 + .../Diagnostics}/HelperResult.cs | 0 .../Diagnostics.EFCore.FunctionalTests.csproj | 23 - .../Diagnostics.FunctionalTests.csproj | 30 - .../ElmPageSampleTest.cs | 35 - test/Directory.Build.props | 14 - ...agnostics.EntityFrameworkCore.Tests.csproj | 24 - .../HealthCheckMiddlewareTests.cs | 243 -- ...Core.Diagnostics.HealthChecks.Tests.csproj | 20 - ...rosoft.AspNetCore.Diagnostics.Tests.csproj | 34 - ...AspNetCore.MiddlewareAnalysis.Tests.csproj | 22 - .../CompositeHealthCheckResultTests.cs | 31 - .../HealthCheckServiceTests.cs | 256 -- .../HealthChecksBuilderTests.cs | 30 - ...ions.Diagnostics.HealthChecks.Tests.csproj | 19 - .../ServiceCollectionExtensionsTests.cs | 33 - version.props | 18 - 246 files changed, 257 insertions(+), 10979 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .gitattributes delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .gitignore delete mode 100644 .travis.yml delete mode 100644 CONTRIBUTING.md delete mode 100644 DiagnosticsPages.sln delete mode 100644 Directory.Build.props delete mode 100644 Directory.Build.targets delete mode 100644 LICENSE.txt delete mode 100644 NuGet.config delete mode 100644 NuGetPackageVerifier.json delete mode 100644 README.md delete mode 100644 build.cmd delete mode 100755 build.sh delete mode 100644 build/Key.snk delete mode 100644 build/dependencies.props delete mode 100644 build/repo.props delete mode 100644 build/sources.props delete mode 100644 korebuild-lock.txt delete mode 100644 korebuild.json delete mode 100644 run.cmd delete mode 100644 run.ps1 delete mode 100755 run.sh delete mode 100644 samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj delete mode 100644 samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj delete mode 100644 samples/ElmPageSample/ElmPageSample.csproj delete mode 100644 samples/ElmPageSample/HelloWorldMiddleware.cs delete mode 100644 samples/ElmPageSample/Startup.cs delete mode 100644 samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj delete mode 100644 samples/ExceptionHandlerSample/wwwroot/error.html delete mode 100644 samples/HealthChecksSample/HealthChecksSample.csproj delete mode 100644 samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj delete mode 100644 samples/StatusCodePagesSample/StatusCodePagesSample.csproj delete mode 100644 samples/WelcomePageSample/WelcomePageSample.csproj delete mode 100644 samples/WelcomePageSample/web.config delete mode 100644 src/Directory.Build.props delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.css delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.css delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cshtml delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.css delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPageModel.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cshtml delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.css delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPageModel.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/Shared.css delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Shared.css delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.Elm/baseline.netcore.json delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckAppBuilderExtensions.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckMiddleware.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckOptions.cs delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj delete mode 100644 src/Microsoft.AspNetCore.Diagnostics.HealthChecks/baseline.netcore.json delete mode 100644 src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckResult.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckStatus.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/IHealthCheck.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/baseline.netcore.json delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/CompositeHealthCheckResult.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheck.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckLogScope.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckService.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckServiceCollectionExtensions.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilder.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilderAddCheckExtensions.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthCheckService.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthChecksBuilder.cs delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj delete mode 100644 src/Microsoft.Extensions.Diagnostics.HealthChecks/baseline.netcore.json rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/CompilationFailure.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/DiagnosticMessage.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/ICompilationException.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/IExceptionHandlerFeature.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/IExceptionHandlerPathFeature.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/IStatusCodePagesFeature.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/IStatusCodeReExecuteFeature.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj (100%) rename src/{Microsoft.AspNetCore.Diagnostics.Abstractions => Middleware/Diagnostics.Abstractions/src}/baseline.netcore.json (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/DatabaseErrorPageExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/DatabaseErrorPageMiddleware.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/DatabaseErrorPageOptions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Internal/DiagnosticsEntityFrameworkCoreLoggerExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj (53%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/MigrationsEndPointExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/MigrationsEndPointMiddleware.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/MigrationsEndPointOptions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Properties/AssemblyInfo.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Properties/Strings.Designer.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Strings.resx (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Views/DatabaseErrorPage.Designer.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Views/DatabaseErrorPage.cshtml (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Views/DatabaseErrorPageModel.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/Views/ErrorPage.css (100%) rename src/{Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore => Middleware/Diagnostics.EntityFrameworkCore/src}/baseline.netcore.json (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/DatabaseErrorPageMiddlewareTest.cs (100%) create mode 100644 src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/Helpers/PlatformHelper.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/Helpers/StringHelpers.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/Helpers/TestLoggerProvider.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/MigrationsEndPointMiddlewareTest.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/SqlServerTestStore.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/TestModels/Blog.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/TestModels/BloggingContext.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/TestModels/BloggingContextWithMigrations.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/TestModels/BloggingContextWithPendingModelChanges.cs (100%) rename {test/Diagnostics.EFCore.FunctionalTests => src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests}/TestModels/BloggingContextWithSnapshotThatThrows.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests => src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests}/DatabaseErrorPageOptionsTest.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests => src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests}/DatabaseErrorPageTest.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests => src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests}/Helpers/AssertHelpers.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests => src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests}/Helpers/StringHelpers.cs (100%) create mode 100644 src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj rename {test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests => src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests}/TestHelperExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/.csslintrc (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/.jshintrc (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/CompilationErrorModel.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/ErrorPage.Designer.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/ErrorPage.cshtml (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/ErrorPage.css (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/ErrorPage.js (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/DeveloperExceptionPage/Views/ErrorPageModel.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/ExceptionHandler/ExceptionHandlerExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/ExceptionHandler/ExceptionHandlerFeature.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/ExceptionHandler/ExceptionHandlerMiddleware.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/ExceptionHandler/ExceptionHandlerOptions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/Internal/DiagnosticsLoggerExtensions.cs (100%) create mode 100644 src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/Properties/AssemblyInfo.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/Properties/Resources.Designer.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/Resources.resx (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/StatusCodePage/StatusCodeContext.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/StatusCodePage/StatusCodePagesExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/StatusCodePage/StatusCodePagesFeature.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/StatusCodePage/StatusCodePagesMiddleware.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/StatusCodePage/StatusCodePagesOptions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/StatusCodePage/StatusCodeReExecuteFeature.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/WelcomePage/Views/Obsolete/WelcomePage.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/WelcomePage/Views/Obsolete/WelcomePage.cshtml (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/WelcomePage/Views/WelcomePage.Designer.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/WelcomePage/Views/WelcomePage.cshtml (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/WelcomePage/WelcomePageExtensions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/WelcomePage/WelcomePageMiddleware.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/WelcomePage/WelcomePageOptions.cs (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/_gruntfile.js (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/_gruntfile.readme (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/_package.json (100%) rename src/{Microsoft.AspNetCore.Diagnostics => Middleware/Diagnostics/src}/baseline.netcore.json (100%) rename {test/Diagnostics.FunctionalTests => src/Middleware/Diagnostics/test/FunctionalTests}/DatabaseErrorPageSampleTest.cs (100%) rename {test/Diagnostics.FunctionalTests => src/Middleware/Diagnostics/test/FunctionalTests}/DeveloperExceptionPageSampleTest.cs (100%) create mode 100644 src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj rename {test/Diagnostics.FunctionalTests => src/Middleware/Diagnostics/test/FunctionalTests}/ExceptionHandlerSampleTest.cs (100%) rename {test/Diagnostics.FunctionalTests => src/Middleware/Diagnostics/test/FunctionalTests}/MiddlewareAnalysisSampleTest.cs (100%) rename {test/Diagnostics.FunctionalTests => src/Middleware/Diagnostics/test/FunctionalTests}/StatusCodeSampleTest.cs (100%) rename {test/Diagnostics.FunctionalTests => src/Middleware/Diagnostics/test/FunctionalTests}/TestFixture.cs (100%) rename {test/Diagnostics.FunctionalTests => src/Middleware/Diagnostics/test/FunctionalTests}/WelcomePageSampleTest.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/DeveloperExceptionPageMiddlewareTest.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/ElmLoggerTest.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/ElmMiddlewareTest.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/ExceptionDetailsProviderTest.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/ExceptionHandlerTest.cs (100%) create mode 100644 src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/Resources/TestFiles/EmbeddedSourceFile.txt (100%) rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/TestDiagnosticListener.cs (100%) rename {test/Microsoft.AspNetCore.Diagnostics.Tests => src/Middleware/Diagnostics/test/UnitTests}/TestFiles/SourceFile.txt (100%) rename {test => src/Middleware/Diagnostics/test/testassets}/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj (100%) rename {test => src/Middleware/Diagnostics/test/testassets}/ClassLibraryWithPortablePdbs/ExceptionType.cs (100%) create mode 100644 src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj rename {samples => src/Middleware/Diagnostics/test/testassets}/DatabaseErrorPageSample/Startup.cs (100%) rename {samples => src/Middleware/Diagnostics/test/testassets}/DatabaseErrorPageSample/web.config (100%) create mode 100644 src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj rename {samples => src/Middleware/Diagnostics/test/testassets}/DeveloperExceptionPageSample/Startup.cs (100%) rename {samples => src/Middleware/Diagnostics/test/testassets}/DeveloperExceptionPageSample/web.config (100%) create mode 100644 src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj rename {samples => src/Middleware/Diagnostics/test/testassets}/ExceptionHandlerSample/Startup.cs (100%) rename {samples/ElmPageSample => src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample}/web.config (100%) rename {samples/ElmPageSample => src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample}/wwwroot/error.html (100%) create mode 100644 src/Middleware/Diagnostics/test/testassets/HealthChecksSample/HealthChecksSample.csproj rename {samples => src/Middleware/Diagnostics/test/testassets}/HealthChecksSample/Program.cs (100%) rename {samples => src/Middleware/Diagnostics/test/testassets}/HealthChecksSample/Startup.cs (100%) rename {samples => src/Middleware/Diagnostics/test/testassets}/StatusCodePagesSample/Startup.cs (100%) create mode 100644 src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj rename {samples/ExceptionHandlerSample => src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample}/web.config (100%) rename {samples => src/Middleware/Diagnostics/test/testassets}/WelcomePageSample/Startup.cs (100%) create mode 100644 src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj rename {samples/MiddlewareAnalysisSample => src/Middleware/Diagnostics/test/testassets/WelcomePageSample}/web.config (100%) create mode 100644 src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj rename {samples => src/Middleware/MiddlewareAnalysis/samples}/MiddlewareAnalysisSample/Startup.cs (100%) rename {samples/StatusCodePagesSample => src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample}/web.config (100%) rename src/{Microsoft.AspNetCore.MiddlewareAnalysis => Middleware/MiddlewareAnalysis/src}/AnalysisBuilder.cs (100%) rename src/{Microsoft.AspNetCore.MiddlewareAnalysis => Middleware/MiddlewareAnalysis/src}/AnalysisMiddleware.cs (100%) rename src/{Microsoft.AspNetCore.MiddlewareAnalysis => Middleware/MiddlewareAnalysis/src}/AnalysisServiceCollectionExtensions.cs (100%) rename src/{Microsoft.AspNetCore.MiddlewareAnalysis => Middleware/MiddlewareAnalysis/src}/AnalysisStartupFilter.cs (100%) rename src/{Microsoft.AspNetCore.MiddlewareAnalysis => Middleware/MiddlewareAnalysis/src}/Microsoft.AspNetCore.MiddlewareAnalysis.csproj (51%) rename src/{Microsoft.AspNetCore.MiddlewareAnalysis => Middleware/MiddlewareAnalysis/src}/baseline.netcore.json (100%) create mode 100644 src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj rename {test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests => src/Middleware/MiddlewareAnalysis/test}/MiddlewareAnalysisTests.cs (100%) rename {test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests => src/Middleware/MiddlewareAnalysis/test}/TestDiagnosticListener.cs (100%) rename src/{shared => Shared/Diagnostics}/AttributeValue.cs (100%) rename src/{shared => Shared/Diagnostics}/BaseView.cs (100%) create mode 100644 src/Shared/Diagnostics/Directory.Build.props rename src/{shared => Shared/Diagnostics}/HelperResult.cs (100%) delete mode 100644 test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj delete mode 100644 test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj delete mode 100644 test/Diagnostics.FunctionalTests/ElmPageSampleTest.cs delete mode 100644 test/Directory.Build.props delete mode 100644 test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj delete mode 100644 test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/HealthCheckMiddlewareTests.cs delete mode 100644 test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj delete mode 100644 test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj delete mode 100644 test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj delete mode 100644 test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/CompositeHealthCheckResultTests.cs delete mode 100644 test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthCheckServiceTests.cs delete mode 100644 test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthChecksBuilderTests.cs delete mode 100644 test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj delete mode 100644 test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/ServiceCollectionExtensionsTests.cs delete mode 100644 version.props diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 4eea96ab69..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,17 +0,0 @@ -init: -- git config --global core.autocrlf true -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -build_script: -- ps: .\run.ps1 default-build -clone_depth: 1 -environment: - global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: 'off' -deploy: 'off' -os: Visual Studio 2017 diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index d4ee1cb7f3..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,52 +0,0 @@ -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain - -*.jpg binary -*.png binary -*.gif binary - -*.cs text=auto diff=csharp -*.vb text=auto -*.resx text=auto -*.c text=auto -*.cpp text=auto -*.cxx text=auto -*.h text=auto -*.hxx text=auto -*.py text=auto -*.rb text=auto -*.java text=auto -*.html text=auto -*.htm text=auto -*.css text=auto -*.scss text=auto -*.sass text=auto -*.less text=auto -*.js text=auto -*.lisp text=auto -*.clj text=auto -*.sql text=auto -*.php text=auto -*.lua text=auto -*.m text=auto -*.asm text=auto -*.erl text=auto -*.fs text=auto -*.fsx text=auto -*.hs text=auto - -*.csproj text=auto -*.vbproj text=auto -*.fsproj text=auto -*.dbproj text=auto -*.sln text=auto eol=crlf - -*.sh eol=lf diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 101a084f0a..0000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -THIS ISSUE TRACKER IS CLOSED - please log new issues here: https://github.com/aspnet/Home/issues - -For information about this change, see https://github.com/aspnet/Announcements/issues/283 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index cac0c595e6..0000000000 --- a/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -*.sln.ide -node_modules -*.sln.ide -project.lock.json -.vs/ -.vscode/ -launchSettings.json -.build/ -.testPublish/ -global.json - -# Rider and friends -.idea/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 64bdbb4441..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: csharp -sudo: false -dist: trusty -env: - global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -mono: none -os: -- linux -- osx -osx_image: xcode8.2 -addons: - apt: - packages: - - libunwind8 -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -before_install: -- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s - /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib - /usr/local/lib/; fi -script: -- ./build.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 64ff041d5c..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -====== - -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. diff --git a/DiagnosticsPages.sln b/DiagnosticsPages.sln deleted file mode 100644 index 655c4fcb5a..0000000000 --- a/DiagnosticsPages.sln +++ /dev/null @@ -1,380 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26923.0 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{509A6F36-AD80-4A18-B5B1-717D38DFF29D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{ACAA0157-A8C4-4152-93DE-90CCDF304087}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WelcomePageSample", "samples\WelcomePageSample\WelcomePageSample.csproj", "{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "src\Microsoft.AspNetCore.Diagnostics\Microsoft.AspNetCore.Diagnostics.csproj", "{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.csproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AF90579-B118-4583-AE88-672EFACB5BC4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Tests", "test\Microsoft.AspNetCore.Diagnostics.Tests\Microsoft.AspNetCore.Diagnostics.Tests.csproj", "{994351B4-7B2A-4139-8B72-72C5BB5CC618}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExceptionHandlerSample", "samples\ExceptionHandlerSample\ExceptionHandlerSample.csproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests", "test\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj", "{5486117B-A742-49E0-94FC-12B76F061803}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Elm", "src\Microsoft.AspNetCore.Diagnostics.Elm\Microsoft.AspNetCore.Diagnostics.Elm.csproj", "{624B0019-956A-4157-B008-270C5B229553}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatusCodePagesSample", "samples\StatusCodePagesSample\StatusCodePagesSample.csproj", "{CC1F5841-FE10-4DDB-8477-C4DE92BA759F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "src\Microsoft.AspNetCore.Diagnostics.Abstractions\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElmPageSample", "samples\ElmPageSample\ElmPageSample.csproj", "{FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseErrorPageSample", "samples\DatabaseErrorPageSample\DatabaseErrorPageSample.csproj", "{FF7F11A1-14E7-4948-A853-2487D99DE0C6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.MiddlewareAnalysis", "src\Microsoft.AspNetCore.MiddlewareAnalysis\Microsoft.AspNetCore.MiddlewareAnalysis.csproj", "{C2DEDD37-D1EB-4819-9A9C-475E37A52358}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareAnalysisSample", "samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.csproj", "{95981429-F212-44E1-83AA-32DA9E2A517C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.MiddlewareAnalysis.Tests", "test\Microsoft.AspNetCore.MiddlewareAnalysis.Tests\Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj", "{B0166AED-738F-42EE-AF4D-C487C8B21521}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryWithPortablePdbs", "test\ClassLibraryWithPortablePdbs\ClassLibraryWithPortablePdbs.csproj", "{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diagnostics.EFCore.FunctionalTests", "test\Diagnostics.EFCore.FunctionalTests\Diagnostics.EFCore.FunctionalTests.csproj", "{043C5272-D7F7-4DB1-830F-5DC93CC0878E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diagnostics.FunctionalTests", "test\Diagnostics.FunctionalTests\Diagnostics.FunctionalTests.csproj", "{C142A666-D932-4E0D-8D18-5B08944C1077}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj", "{0D103C24-B9E8-468A-B113-509FCFEF7B45}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks", "src\Microsoft.Extensions.Diagnostics.HealthChecks\Microsoft.Extensions.Diagnostics.HealthChecks.csproj", "{F285F000-9342-4A01-9706-BAB2B97B4F97}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.HealthChecks", "src\Microsoft.AspNetCore.Diagnostics.HealthChecks\Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj", "{1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HealthChecksSample", "samples\HealthChecksSample\HealthChecksSample.csproj", "{3B4E60F6-E42D-496E-B96F-71A11DABAEE7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests", "test\Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests\Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj", "{E718CE19-23CC-427F-B06E-B866E9A35924}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.Tests", "test\Microsoft.Extensions.Diagnostics.HealthChecks.Tests\Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj", "{3783E8E4-2E96-4987-A83A-0CCCAF4891C1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|x86.ActiveCfg = Debug|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Release|Any CPU.Build.0 = Release|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Release|x86.ActiveCfg = Release|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Debug|x86.ActiveCfg = Debug|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Release|Any CPU.Build.0 = Release|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Release|x86.ActiveCfg = Release|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|x86.ActiveCfg = Debug|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|Any CPU.Build.0 = Release|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|x86.ActiveCfg = Release|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Debug|Any CPU.Build.0 = Debug|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Debug|x86.ActiveCfg = Debug|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Release|Any CPU.ActiveCfg = Release|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Release|Any CPU.Build.0 = Release|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {994351B4-7B2A-4139-8B72-72C5BB5CC618}.Release|x86.ActiveCfg = Release|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Debug|Any CPU.Build.0 = Debug|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Debug|x86.ActiveCfg = Debug|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Release|Any CPU.ActiveCfg = Release|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Release|Any CPU.Build.0 = Release|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {427CDB36-78B0-4583-9EBC-7F283DE60355}.Release|x86.ActiveCfg = Release|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Debug|x86.ActiveCfg = Debug|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Debug|x86.Build.0 = Debug|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Release|Any CPU.Build.0 = Release|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Release|x86.ActiveCfg = Release|Any CPU - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}.Release|x86.Build.0 = Release|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Debug|x86.ActiveCfg = Debug|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Debug|x86.Build.0 = Debug|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Release|Any CPU.Build.0 = Release|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Release|x86.ActiveCfg = Release|Any CPU - {5486117B-A742-49E0-94FC-12B76F061803}.Release|x86.Build.0 = Release|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Debug|Any CPU.Build.0 = Debug|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Debug|x86.ActiveCfg = Debug|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Debug|x86.Build.0 = Debug|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Release|Any CPU.ActiveCfg = Release|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Release|Any CPU.Build.0 = Release|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Release|x86.ActiveCfg = Release|Any CPU - {624B0019-956A-4157-B008-270C5B229553}.Release|x86.Build.0 = Release|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Debug|x86.ActiveCfg = Debug|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Debug|x86.Build.0 = Debug|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Release|Any CPU.Build.0 = Release|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Release|x86.ActiveCfg = Release|Any CPU - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F}.Release|x86.Build.0 = Release|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Debug|x86.ActiveCfg = Debug|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Debug|x86.Build.0 = Debug|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Release|Any CPU.Build.0 = Release|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Release|x86.ActiveCfg = Release|Any CPU - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}.Release|x86.Build.0 = Release|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Debug|x86.ActiveCfg = Debug|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Debug|x86.Build.0 = Debug|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Release|Any CPU.Build.0 = Release|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Release|x86.ActiveCfg = Release|Any CPU - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}.Release|x86.Build.0 = Release|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Debug|x86.ActiveCfg = Debug|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Debug|x86.Build.0 = Debug|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Release|Any CPU.Build.0 = Release|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Release|x86.ActiveCfg = Release|Any CPU - {FF7F11A1-14E7-4948-A853-2487D99DE0C6}.Release|x86.Build.0 = Release|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Debug|x86.ActiveCfg = Debug|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Debug|x86.Build.0 = Debug|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Release|Any CPU.Build.0 = Release|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Release|x86.ActiveCfg = Release|Any CPU - {C2DEDD37-D1EB-4819-9A9C-475E37A52358}.Release|x86.Build.0 = Release|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Debug|x86.ActiveCfg = Debug|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Debug|x86.Build.0 = Debug|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Release|Any CPU.Build.0 = Release|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Release|x86.ActiveCfg = Release|Any CPU - {95981429-F212-44E1-83AA-32DA9E2A517C}.Release|x86.Build.0 = Release|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Debug|x86.ActiveCfg = Debug|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Debug|x86.Build.0 = Debug|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Release|Any CPU.Build.0 = Release|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Release|x86.ActiveCfg = Release|Any CPU - {B0166AED-738F-42EE-AF4D-C487C8B21521}.Release|x86.Build.0 = Release|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|x86.ActiveCfg = Debug|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|x86.Build.0 = Debug|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Release|Any CPU.Build.0 = Release|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Release|x86.ActiveCfg = Release|Any CPU - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Release|x86.Build.0 = Release|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Debug|x86.ActiveCfg = Debug|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Debug|x86.Build.0 = Debug|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Release|Any CPU.Build.0 = Release|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Release|x86.ActiveCfg = Release|Any CPU - {043C5272-D7F7-4DB1-830F-5DC93CC0878E}.Release|x86.Build.0 = Release|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Debug|x86.ActiveCfg = Debug|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Debug|x86.Build.0 = Debug|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Release|Any CPU.Build.0 = Release|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Release|x86.ActiveCfg = Release|Any CPU - {C142A666-D932-4E0D-8D18-5B08944C1077}.Release|x86.Build.0 = Release|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Debug|x86.ActiveCfg = Debug|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Debug|x86.Build.0 = Debug|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Release|Any CPU.Build.0 = Release|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Release|x86.ActiveCfg = Release|Any CPU - {0D103C24-B9E8-468A-B113-509FCFEF7B45}.Release|x86.Build.0 = Release|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Debug|x86.ActiveCfg = Debug|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Debug|x86.Build.0 = Debug|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Release|Any CPU.Build.0 = Release|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Release|x86.ActiveCfg = Release|Any CPU - {F285F000-9342-4A01-9706-BAB2B97B4F97}.Release|x86.Build.0 = Release|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Debug|x86.ActiveCfg = Debug|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Debug|x86.Build.0 = Debug|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Release|Any CPU.Build.0 = Release|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Release|x86.ActiveCfg = Release|Any CPU - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C}.Release|x86.Build.0 = Release|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Debug|x86.Build.0 = Debug|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Release|Any CPU.Build.0 = Release|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Release|x86.ActiveCfg = Release|Any CPU - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7}.Release|x86.Build.0 = Release|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Debug|x86.ActiveCfg = Debug|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Debug|x86.Build.0 = Debug|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Release|Any CPU.Build.0 = Release|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Release|x86.ActiveCfg = Release|Any CPU - {E718CE19-23CC-427F-B06E-B866E9A35924}.Release|x86.Build.0 = Release|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Debug|x86.ActiveCfg = Debug|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Debug|x86.Build.0 = Debug|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Release|Any CPU.Build.0 = Release|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Release|x86.ActiveCfg = Release|Any CPU - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {C5F59CBA-DF2D-4983-8CBB-11B6AF21B416} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {589AC17F-9455-4764-8F82-FCD2AE58DA14} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {994351B4-7B2A-4139-8B72-72C5BB5CC618} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - {427CDB36-78B0-4583-9EBC-7F283DE60355} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {5486117B-A742-49E0-94FC-12B76F061803} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - {624B0019-956A-4157-B008-270C5B229553} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {CC1F5841-FE10-4DDB-8477-C4DE92BA759F} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {83FFB65A-97B1-45AA-BCB8-3F43966BC8A3} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {FFD28DCF-C24F-4C59-9B6B-F3B74CE13129} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {FF7F11A1-14E7-4948-A853-2487D99DE0C6} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {C2DEDD37-D1EB-4819-9A9C-475E37A52358} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {95981429-F212-44E1-83AA-32DA9E2A517C} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {B0166AED-738F-42EE-AF4D-C487C8B21521} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - {AA3661A1-CE8D-4597-ADFD-A5A30834E5D0} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - {043C5272-D7F7-4DB1-830F-5DC93CC0878E} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - {C142A666-D932-4E0D-8D18-5B08944C1077} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - {0D103C24-B9E8-468A-B113-509FCFEF7B45} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {F285F000-9342-4A01-9706-BAB2B97B4F97} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {1B2B1EF4-9066-4F38-ADCF-D05C6423E21C} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D} - {3B4E60F6-E42D-496E-B96F-71A11DABAEE7} = {ACAA0157-A8C4-4152-93DE-90CCDF304087} - {E718CE19-23CC-427F-B06E-B866E9A35924} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - {3783E8E4-2E96-4987-A83A-0CCCAF4891C1} = {2AF90579-B118-4583-AE88-672EFACB5BC4} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D915AA7B-4ADE-4BAC-AF65-1E800D3F3580} - EndGlobalSection -EndGlobal diff --git a/Directory.Build.props b/Directory.Build.props deleted file mode 100644 index 6409867c7e..0000000000 --- a/Directory.Build.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/Diagnostics - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - true - - - diff --git a/Directory.Build.targets b/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 7b2956ecee..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (c) .NET Foundation and Contributors - -All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index e32bddfd51..0000000000 --- a/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json deleted file mode 100644 index b153ab1515..0000000000 --- a/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 63e17d05d3..0000000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -ASP.NET Core Diagnostics -================ - -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/5224cefq6y78aq21/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Diagnostics/branch/dev) - -Travis: [![Travis](https://travis-ci.org/aspnet/Diagnostics.svg?branch=dev)](https://travis-ci.org/aspnet/Diagnostics) - -Diagnostics middleware for reporting info and handling exceptions and errors in ASP.NET Core, and diagnosing Entity Framework Core migrations errors. - - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. diff --git a/build.cmd b/build.cmd deleted file mode 100644 index c0050bda12..0000000000 --- a/build.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE" diff --git a/build.sh b/build.sh deleted file mode 100755 index 98a4b22765..0000000000 --- a/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) -chmod +x "$DIR/run.sh"; sync -"$DIR/run.sh" default-build "$@" diff --git a/build/Key.snk b/build/Key.snk deleted file mode 100644 index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 9114da1533..0000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,52 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 15.6.1 - 4.7.49 - 2.0.3 - 11.0.2 - 4.5.0 - 1.6.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.2 - 2.1.1 - 2.1.1 - 2.1.0 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.0 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/build/repo.props b/build/repo.props deleted file mode 100644 index e5c050b920..0000000000 --- a/build/repo.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - - - - - - diff --git a/build/sources.props b/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/korebuild-lock.txt b/korebuild-lock.txt deleted file mode 100644 index 251c227c83..0000000000 --- a/korebuild-lock.txt +++ /dev/null @@ -1,2 +0,0 @@ -version:2.1.3-rtm-15802 -commithash:a7c08b45b440a7d2058a0aa1eaa3eb6ba811976a diff --git a/korebuild.json b/korebuild.json deleted file mode 100644 index 678d8bb948..0000000000 --- a/korebuild.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json", - "channel": "release/2.1" -} diff --git a/run.cmd b/run.cmd deleted file mode 100644 index d52d5c7e68..0000000000 --- a/run.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE" diff --git a/run.ps1 b/run.ps1 deleted file mode 100644 index 27dcf848f8..0000000000 --- a/run.ps1 +++ /dev/null @@ -1,196 +0,0 @@ -#!/usr/bin/env powershell -#requires -version 4 - -<# -.SYNOPSIS -Executes KoreBuild commands. - -.DESCRIPTION -Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`. - -.PARAMETER Command -The KoreBuild command to run. - -.PARAMETER Path -The folder to build. Defaults to the folder containing this script. - -.PARAMETER Channel -The channel of KoreBuild to download. Overrides the value from the config file. - -.PARAMETER DotNetHome -The directory where .NET Core tools will be stored. - -.PARAMETER ToolsSource -The base url where build tools can be downloaded. Overrides the value from the config file. - -.PARAMETER Update -Updates KoreBuild to the latest version even if a lock file is present. - -.PARAMETER ConfigFile -The path to the configuration file that stores values. Defaults to korebuild.json. - -.PARAMETER ToolsSourceSuffix -The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. - -.PARAMETER Arguments -Arguments to be passed to the command - -.NOTES -This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. -When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. - -The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set -in the file are overridden by command line parameters. - -.EXAMPLE -Example config file: -```json -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", - "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" -} -``` -#> -[CmdletBinding(PositionalBinding = $false)] -param( - [Parameter(Mandatory = $true, Position = 0)] - [string]$Command, - [string]$Path = $PSScriptRoot, - [Alias('c')] - [string]$Channel, - [Alias('d')] - [string]$DotNetHome, - [Alias('s')] - [string]$ToolsSource, - [Alias('u')] - [switch]$Update, - [string]$ConfigFile, - [string]$ToolsSourceSuffix, - [Parameter(ValueFromRemainingArguments = $true)] - [string[]]$Arguments -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -# -# Functions -# - -function Get-KoreBuild { - - $lockFile = Join-Path $Path 'korebuild-lock.txt' - - if (!(Test-Path $lockFile) -or $Update) { - Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix - } - - $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 - if (!$version) { - Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" - } - $version = $version.TrimStart('version:').Trim() - $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) - - if (!(Test-Path $korebuildPath)) { - Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" - New-Item -ItemType Directory -Path $korebuildPath | Out-Null - $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" - - try { - $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" - Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) { - # Use built-in commands where possible as they are cross-plat compatible - Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath - } - else { - # Fallback to old approach for old installations of PowerShell - Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) - } - } - catch { - Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore - throw - } - finally { - Remove-Item $tmpfile -ErrorAction Ignore - } - } - - return $korebuildPath -} - -function Join-Paths([string]$path, [string[]]$childPaths) { - $childPaths | ForEach-Object { $path = Join-Path $path $_ } - return $path -} - -function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) { - if ($RemotePath -notlike 'http*') { - Copy-Item $RemotePath $LocalPath - return - } - - $retries = 10 - while ($retries -gt 0) { - $retries -= 1 - try { - Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath - return - } - catch { - Write-Verbose "Request failed. $retries retries remaining" - } - } - - Write-Error "Download failed: '$RemotePath'." -} - -# -# Main -# - -# Load configuration or set defaults - -$Path = Resolve-Path $Path -if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' } - -if (Test-Path $ConfigFile) { - try { - $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json - if ($config) { - if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel } - if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource} - } - } - catch { - Write-Warning "$ConfigFile could not be read. Its settings will be ignored." - Write-Warning $Error[0] - } -} - -if (!$DotNetHome) { - $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` - elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` - elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` - else { Join-Path $PSScriptRoot '.dotnet'} -} - -if (!$Channel) { $Channel = 'dev' } -if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } - -# Execute - -$korebuildPath = Get-KoreBuild -Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') - -try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile - Invoke-KoreBuildCommand $Command @Arguments -} -finally { - Remove-Module 'KoreBuild' -ErrorAction Ignore -} diff --git a/run.sh b/run.sh deleted file mode 100755 index 834961fc3a..0000000000 --- a/run.sh +++ /dev/null @@ -1,231 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# -# variables -# - -RESET="\033[0m" -RED="\033[0;31m" -YELLOW="\033[0;33m" -MAGENTA="\033[0;95m" -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" -verbose=false -update=false -repo_path="$DIR" -channel='' -tools_source='' -tools_source_suffix='' - -# -# Functions -# -__usage() { - echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] ...]" - echo "" - echo "Arguments:" - echo " command The command to be run." - echo " ... Arguments passed to the command. Variable number of arguments allowed." - echo "" - echo "Options:" - echo " --verbose Show verbose output." - echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." - echo " --config-file The path to the configuration file that stores values. Defaults to korebuild.json." - echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." - echo " --path The directory to build. Defaults to the directory containing the script." - echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." - echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." - echo " -u|--update Update to the latest KoreBuild even if the lock file is present." - echo "" - echo "Description:" - echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." - echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." - - if [[ "${1:-}" != '--no-exit' ]]; then - exit 2 - fi -} - -get_korebuild() { - local version - local lock_file="$repo_path/korebuild-lock.txt" - if [ ! -f "$lock_file" ] || [ "$update" = true ]; then - __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix" - fi - version="$(grep 'version:*' -m 1 "$lock_file")" - if [[ "$version" == '' ]]; then - __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" - return 1 - fi - version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" - local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" - - { - if [ ! -d "$korebuild_path" ]; then - mkdir -p "$korebuild_path" - local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" - tmpfile="$(mktemp)" - echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" - if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then - unzip -q -d "$korebuild_path" "$tmpfile" - fi - rm "$tmpfile" || true - fi - - source "$korebuild_path/KoreBuild.sh" - } || { - if [ -d "$korebuild_path" ]; then - echo "Cleaning up after failed installation" - rm -rf "$korebuild_path" || true - fi - return 1 - } -} - -__error() { - echo -e "${RED}error: $*${RESET}" 1>&2 -} - -__warn() { - echo -e "${YELLOW}warning: $*${RESET}" -} - -__machine_has() { - hash "$1" > /dev/null 2>&1 - return $? -} - -__get_remote_file() { - local remote_path=$1 - local local_path=$2 - local remote_path_suffix=$3 - - if [[ "$remote_path" != 'http'* ]]; then - cp "$remote_path" "$local_path" - return 0 - fi - - local failed=false - if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - else - failed=true - fi - - if [ "$failed" = true ] && __machine_has curl; then - failed=false - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - fi - - if [ "$failed" = true ]; then - __error "Download failed: $remote_path" 1>&2 - return 1 - fi -} - -# -# main -# - -command="${1:-}" -shift - -while [[ $# -gt 0 ]]; do - case $1 in - -\?|-h|--help) - __usage --no-exit - exit 0 - ;; - -c|--channel|-Channel) - shift - channel="${1:-}" - [ -z "$channel" ] && __usage - ;; - --config-file|-ConfigFile) - shift - config_file="${1:-}" - [ -z "$config_file" ] && __usage - if [ ! -f "$config_file" ]; then - __error "Invalid value for --config-file. $config_file does not exist." - exit 1 - fi - ;; - -d|--dotnet-home|-DotNetHome) - shift - DOTNET_HOME="${1:-}" - [ -z "$DOTNET_HOME" ] && __usage - ;; - --path|-Path) - shift - repo_path="${1:-}" - [ -z "$repo_path" ] && __usage - ;; - -s|--tools-source|-ToolsSource) - shift - tools_source="${1:-}" - [ -z "$tools_source" ] && __usage - ;; - --tools-source-suffix|-ToolsSourceSuffix) - shift - tools_source_suffix="${1:-}" - [ -z "$tools_source_suffix" ] && __usage - ;; - -u|--update|-Update) - update=true - ;; - --verbose|-Verbose) - verbose=true - ;; - --) - shift - break - ;; - *) - break - ;; - esac - shift -done - -if ! __machine_has unzip; then - __error 'Missing required command: unzip' - exit 1 -fi - -if ! __machine_has curl && ! __machine_has wget; then - __error 'Missing required command. Either wget or curl is required.' - exit 1 -fi - -[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json" -if [ -f "$config_file" ]; then - if __machine_has jq ; then - if jq '.' "$config_file" >/dev/null ; then - config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" - config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" - else - __warn "$config_file is invalid JSON. Its settings will be ignored." - fi - elif __machine_has python ; then - if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __warn "$config_file is invalid JSON. Its settings will be ignored." - fi - else - __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.' - fi - - [ ! -z "${config_channel:-}" ] && channel="$config_channel" - [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" -fi - -[ -z "$channel" ] && channel='dev' -[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' - -get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" -invoke_korebuild_command "$command" "$@" diff --git a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj deleted file mode 100644 index 9ddf86922c..0000000000 --- a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net461;netcoreapp2.0;netcoreapp2.1 - - - - - - - - - - - - - - diff --git a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj deleted file mode 100644 index 3c9fff2be0..0000000000 --- a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net461;netcoreapp2.0;netcoreapp2.1 - - - - - - - - - - - - diff --git a/samples/ElmPageSample/ElmPageSample.csproj b/samples/ElmPageSample/ElmPageSample.csproj deleted file mode 100644 index 7946494dae..0000000000 --- a/samples/ElmPageSample/ElmPageSample.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net461;netcoreapp2.0;netcoreapp2.1 - - - - - - - - - - - diff --git a/samples/ElmPageSample/HelloWorldMiddleware.cs b/samples/ElmPageSample/HelloWorldMiddleware.cs deleted file mode 100644 index 70efb8914a..0000000000 --- a/samples/ElmPageSample/HelloWorldMiddleware.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; - -namespace ElmPageSample -{ - public class HelloWorldMiddleware - { - private readonly ILogger _logger; - private readonly RequestDelegate _next; - - public HelloWorldMiddleware(RequestDelegate next, ILoggerFactory loggerFactory) - { - _next = next; - _logger = loggerFactory.CreateLogger(); - } - - public async Task Invoke(HttpContext httpContext) - { - using (_logger.BeginScope("Scope1")) - { - _logger.LogDebug("Getting message"); - - httpContext.Response.ContentType = "text/html; charset=utf-8"; - await httpContext.Response.WriteAsync( - "

Hello World!

Elm Logs"); - } - } - } -} \ No newline at end of file diff --git a/samples/ElmPageSample/Startup.cs b/samples/ElmPageSample/Startup.cs deleted file mode 100644 index 7fa96ac08c..0000000000 --- a/samples/ElmPageSample/Startup.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace ElmPageSample -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddElm(elmOptions => - { - elmOptions.Filter = (loggerName, loglevel) => loglevel == LogLevel.Debug; - }); - } - - public void Configure(IApplicationBuilder app) - { - app.UseElmPage(); - - app.UseElmCapture(); - - app.UseMiddleware(); - } - - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseKestrel() - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); - } - } -} - diff --git a/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj b/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj deleted file mode 100644 index 2b7f85b349..0000000000 --- a/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net461;netcoreapp2.0;netcoreapp2.1 - - - - - - - - - - - - - diff --git a/samples/ExceptionHandlerSample/wwwroot/error.html b/samples/ExceptionHandlerSample/wwwroot/error.html deleted file mode 100644 index b9989e017f..0000000000 --- a/samples/ExceptionHandlerSample/wwwroot/error.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - You've reached the static error page.

- Home
- - \ No newline at end of file diff --git a/samples/HealthChecksSample/HealthChecksSample.csproj b/samples/HealthChecksSample/HealthChecksSample.csproj deleted file mode 100644 index 19ef79337e..0000000000 --- a/samples/HealthChecksSample/HealthChecksSample.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.0 - - - - - - - - - - - - - diff --git a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj deleted file mode 100644 index b7472cbccc..0000000000 --- a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - net461;netcoreapp2.0;netcoreapp2.1 - - - - - - - - - - - - - - - diff --git a/samples/StatusCodePagesSample/StatusCodePagesSample.csproj b/samples/StatusCodePagesSample/StatusCodePagesSample.csproj deleted file mode 100644 index 3c9fff2be0..0000000000 --- a/samples/StatusCodePagesSample/StatusCodePagesSample.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net461;netcoreapp2.0;netcoreapp2.1 - - - - - - - - - - - - diff --git a/samples/WelcomePageSample/WelcomePageSample.csproj b/samples/WelcomePageSample/WelcomePageSample.csproj deleted file mode 100644 index 3c9fff2be0..0000000000 --- a/samples/WelcomePageSample/WelcomePageSample.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net461;netcoreapp2.0;netcoreapp2.1 - - - - - - - - - - - - diff --git a/samples/WelcomePageSample/web.config b/samples/WelcomePageSample/web.config deleted file mode 100644 index f7ac679334..0000000000 --- a/samples/WelcomePageSample/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs deleted file mode 100644 index abfb78caa5..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class ActivityContext - { - public Guid Id { get; set; } - - public HttpInfo HttpInfo { get; set; } - - public ScopeNode Root { get; set; } - - public DateTimeOffset Time { get; set; } - - public bool IsCollapsed { get; set; } - - public bool RepresentsScope { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs deleted file mode 100644 index e71d21dcfa..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - /// - /// Enables the Elm logging service. - /// - public class ElmCaptureMiddleware - { - private readonly RequestDelegate _next; - private readonly ElmOptions _options; - private readonly ILogger _logger; - - public ElmCaptureMiddleware(RequestDelegate next, ILoggerFactory factory, IOptions options) - { - _next = next; - _options = options.Value; - _logger = factory.CreateLogger(); - } - - public async Task Invoke(HttpContext context) - { - using (RequestIdentifier.Ensure(context)) - { - var requestId = context.Features.Get().TraceIdentifier; - using (_logger.BeginScope("Request: {RequestId}", requestId)) - { - try - { - ElmScope.Current.Context.HttpInfo = GetHttpInfo(context); - await _next(context); - } - finally - { - ElmScope.Current.Context.HttpInfo.StatusCode = context.Response.StatusCode; - } - } - } - } - - /// - /// Takes the info from the given HttpContext and copies it to an HttpInfo object - /// - /// The HttpInfo for the current elm context - private static HttpInfo GetHttpInfo(HttpContext context) - { - return new HttpInfo() - { - RequestID = context.Features.Get().TraceIdentifier, - Host = context.Request.Host, - ContentType = context.Request.ContentType, - Path = context.Request.Path, - Scheme = context.Request.Scheme, - StatusCode = context.Response.StatusCode, - User = context.User, - Method = context.Request.Method, - Protocol = context.Request.Protocol, - Headers = context.Request.Headers, - Query = context.Request.QueryString, - Cookies = context.Request.Cookies - }; - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs deleted file mode 100644 index aca56d5bbe..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Diagnostics.Elm; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Builder -{ - public static class ElmExtensions - { - /// - /// Enables the Elm logging service, which can be accessed via the . - /// - public static IApplicationBuilder UseElmCapture(this IApplicationBuilder app) - { - if (app == null) - { - throw new ArgumentNullException(nameof(app)); - } - - // add the elm provider to the factory here so the logger can start capturing logs immediately - var factory = app.ApplicationServices.GetRequiredService() as LoggerFactory; - if (factory != null) - { - var provider = app.ApplicationServices.GetRequiredService(); - factory.AddProvider(provider); - } - - return app.UseMiddleware(); - } - - /// - /// Enables viewing logs captured by the . - /// - public static IApplicationBuilder UseElmPage(this IApplicationBuilder app) - { - if (app == null) - { - throw new ArgumentNullException(nameof(app)); - } - - return app.UseMiddleware(); - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs deleted file mode 100644 index 51eeb60eeb..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class ElmLogger : ILogger - { - private readonly string _name; - private readonly ElmOptions _options; - private readonly ElmStore _store; - - public ElmLogger(string name, ElmOptions options, ElmStore store) - { - _name = name; - _options = options; - _store = store; - } - - public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, - Func formatter) - { - if (!IsEnabled(logLevel) || (state == null && exception == null)) - { - return; - } - LogInfo info = new LogInfo() - { - ActivityContext = GetCurrentActivityContext(), - Name = _name, - EventID = eventId.Id, - Severity = logLevel, - Exception = exception, - State = state, - Message = formatter == null ? state.ToString() : formatter(state, exception), - Time = DateTimeOffset.UtcNow - }; - if (ElmScope.Current != null) - { - ElmScope.Current.Node.Messages.Add(info); - } - // The log does not belong to any scope - create a new context for it - else - { - var context = GetNewActivityContext(); - context.RepresentsScope = false; // mark as a non-scope log - context.Root = new ScopeNode(); - context.Root.Messages.Add(info); - _store.AddActivity(context); - } - } - - public bool IsEnabled(LogLevel logLevel) - { - return _options.Filter(_name, logLevel); - } - - public IDisposable BeginScope(TState state) - { - var scope = new ElmScope(_name, state); - scope.Context = ElmScope.Current?.Context ?? GetNewActivityContext(); - return ElmScope.Push(scope, _store); - } - - private ActivityContext GetNewActivityContext() - { - return new ActivityContext() - { - Id = Guid.NewGuid(), - Time = DateTimeOffset.UtcNow, - RepresentsScope = true - }; - } - - private ActivityContext GetCurrentActivityContext() - { - return ElmScope.Current?.Context ?? GetNewActivityContext(); - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs deleted file mode 100644 index 678ddac55c..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class ElmLoggerProvider : ILoggerProvider - { - private readonly ElmStore _store; - private readonly ElmOptions _options; - - public ElmLoggerProvider(ElmStore store, IOptions options) - { - if (store == null) - { - throw new ArgumentNullException(nameof(store)); - } - - if (options == null) - { - throw new ArgumentNullException(nameof(options)); - } - - _store = store; - _options = options.Value; - } - - public ILogger CreateLogger(string name) - { - return new ElmLogger(name, _options, _store); - } - - public void Dispose() - { - } - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs deleted file mode 100644 index 3a9038cc4e..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - /// - /// Options for ElmMiddleware - /// - public class ElmOptions - { - /// - /// Specifies the path to view the logs. - /// - public PathString Path { get; set; } = new PathString("/Elm"); - - /// - /// Determines whether log statements should be logged based on the name of the logger - /// and the of the message. - /// - public Func Filter { get; set; } = (name, level) => true; - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs deleted file mode 100644 index 63dffd492f..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using System.Linq; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - /// - /// Enables viewing logs captured by the . - /// - public class ElmPageMiddleware - { - private readonly RequestDelegate _next; - private readonly ElmOptions _options; - private readonly ElmStore _store; - - public ElmPageMiddleware(RequestDelegate next, IOptions options, ElmStore store) - { - _next = next; - _options = options.Value; - _store = store; - } - - public async Task Invoke(HttpContext context) - { - if (!context.Request.Path.StartsWithSegments(_options.Path)) - { - await _next(context); - return; - } - - var t = await ParseParams(context); - var options = t.Item1; - var redirect = t.Item2; - if (redirect) - { - return; - } - if (context.Request.Path == _options.Path) - { - RenderMainLogPage(options, context); - } - else - { - RenderDetailsPage(options, context); - } - } - - private async void RenderMainLogPage(ViewOptions options, HttpContext context) - { - var model = new LogPageModel() - { - Activities = _store.GetActivities(), - Options = options, - Path = _options.Path - }; - var logPage = new LogPage(model); - - await logPage.ExecuteAsync(context); - } - - private async void RenderDetailsPage(ViewOptions options, HttpContext context) - { - var parts = context.Request.Path.Value.Split('/'); - var id = Guid.Empty; - if (!Guid.TryParse(parts[parts.Length - 1], out id)) - { - context.Response.StatusCode = 400; - await context.Response.WriteAsync("Invalid Id"); - return; - } - var model = new DetailsPageModel() - { - Activity = _store.GetActivities().Where(a => a.Id == id).FirstOrDefault(), - Options = options - }; - var detailsPage = new DetailsPage(model); - await detailsPage.ExecuteAsync(context); - } - - private async Task> ParseParams(HttpContext context) - { - var options = new ViewOptions() - { - MinLevel = LogLevel.Debug, - NamePrefix = string.Empty - }; - var isRedirect = false; - - IFormCollection form = null; - if (context.Request.HasFormContentType) - { - form = await context.Request.ReadFormAsync(); - } - - if (form != null && form.ContainsKey("clear")) - { - _store.Clear(); - context.Response.Redirect(context.Request.PathBase.Add(_options.Path).ToString()); - isRedirect = true; - } - else - { - if (context.Request.Query.ContainsKey("level")) - { - var minLevel = options.MinLevel; - if (Enum.TryParse(context.Request.Query["level"], out minLevel)) - { - options.MinLevel = minLevel; - } - } - if (context.Request.Query.ContainsKey("name")) - { - var namePrefix = context.Request.Query["name"]; - options.NamePrefix = namePrefix; - } - } - return Tuple.Create(options, isRedirect); - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs deleted file mode 100644 index f64ae23e69..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Threading; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class ElmScope - { - private readonly string _name; - private readonly object _state; - - public ElmScope(string name, object state) - { - _name = name; - _state = state; - } - - public ActivityContext Context { get; set; } - - public ElmScope Parent { get; set; } - - public ScopeNode Node { get; set; } - - private static AsyncLocal _value = new AsyncLocal(); - public static ElmScope Current - { - set - { - _value.Value = value; - } - get - { - return _value.Value; - } - } - - public static IDisposable Push(ElmScope scope, ElmStore store) - { - if (scope == null) - { - throw new ArgumentNullException(nameof(scope)); - } - - if (store == null) - { - throw new ArgumentNullException(nameof(store)); - } - - var temp = Current; - Current = scope; - Current.Parent = temp; - - Current.Node = new ScopeNode() - { - StartTime = DateTimeOffset.UtcNow, - State = Current._state, - Name = Current._name - }; - - if (Current.Parent != null) - { - Current.Node.Parent = Current.Parent.Node; - Current.Parent.Node.Children.Add(Current.Node); - } - else - { - Current.Context.Root = Current.Node; - store.AddActivity(Current.Context); - } - - return new DisposableAction(() => - { - Current.Node.EndTime = DateTimeOffset.UtcNow; - Current = Current.Parent; - }); - } - - private class DisposableAction : IDisposable - { - private Action _action; - - public DisposableAction(Action action) - { - _action = action; - } - - public void Dispose() - { - if (_action != null) - { - _action.Invoke(); - _action = null; - } - } - } - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs deleted file mode 100644 index 2d2da2d176..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Diagnostics.Elm; -using Microsoft.Extensions.DependencyInjection.Extensions; - -namespace Microsoft.Extensions.DependencyInjection -{ - /// - /// Extension methods for setting up Elm services in an . - /// - public static class ElmServiceCollectionExtensions - { - /// - /// Adds error logging middleware services to the specified . - /// - /// The to add services to. - /// The so that additional calls can be chained. - public static IServiceCollection AddElm(this IServiceCollection services) - { - if (services == null) - { - throw new ArgumentNullException(nameof(services)); - } - - services.AddOptions(); - services.TryAddSingleton(); - services.TryAddSingleton(); - - return services; - } - - /// - /// Adds error logging middleware services to the specified . - /// - /// The to add services to. - /// An to configure the provided . - /// The so that additional calls can be chained. - public static IServiceCollection AddElm(this IServiceCollection services, Action setupAction) - { - if (services == null) - { - throw new ArgumentNullException(nameof(services)); - } - - if (setupAction == null) - { - throw new ArgumentNullException(nameof(setupAction)); - } - - services.AddElm(); - services.Configure(setupAction); - - return services; - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs deleted file mode 100644 index c71dedec09..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class ElmStore - { - private const int Capacity = 200; - - private LinkedList Activities { get; set; } = new LinkedList(); - - /// - /// Returns an IEnumerable of the contexts of the logs. - /// - /// An IEnumerable of objects where each context stores - /// information about a top level scope. - public IEnumerable GetActivities() - { - for (var context = Activities.First; context != null; context = context.Next) - { - if (!context.Value.IsCollapsed && CollapseActivityContext(context.Value)) - { - Activities.Remove(context); - } - } - return Activities; - } - - /// - /// Adds a new to the store. - /// - /// The to be added to the store. - public void AddActivity(ActivityContext activity) - { - if (activity == null) - { - throw new ArgumentNullException(nameof(activity)); - } - - lock (Activities) - { - Activities.AddLast(activity); - while (Count() > Capacity) - { - Activities.RemoveFirst(); - } - } - } - - /// - /// Removes all activity contexts that have been stored. - /// - public void Clear() - { - Activities.Clear(); - } - - /// - /// Returns the total number of logs in all activities in the store - /// - /// The total log count - public int Count() - { - return Activities.Sum(a => Count(a.Root)); - } - - private int Count(ScopeNode node) - { - if (node == null) - { - return 0; - } - var sum = node.Messages.Count; - foreach (var child in node.Children) - { - sum += Count(child); - } - return sum; - } - - /// - /// Removes any nodes on the context's scope tree that doesn't have any logs - /// This may occur as a result of the filters turned on - /// - /// The context who's node should be condensed - /// true if the node has been condensed to null, false otherwise - private bool CollapseActivityContext(ActivityContext context) - { - context.Root = CollapseHelper(context.Root); - context.IsCollapsed = true; - return context.Root == null; - } - - private ScopeNode CollapseHelper(ScopeNode node) - { - if (node == null) - { - return node; - } - for (int i = 0; i < node.Children.Count; i++) - { - node.Children[i] = CollapseHelper(node.Children[i]); - } - node.Children.RemoveAll(c => c == null); - if (node.Children.Count == 0 && node.Messages.Count == 0) - { - return null; - } - else - { - return node; - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs deleted file mode 100644 index 70281945b4..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Security.Claims; -using Microsoft.AspNetCore.Http; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class HttpInfo - { - public string RequestID { get; set; } - - public HostString Host { get; set; } - - public PathString Path { get; set; } - - public string ContentType { get; set; } - - public string Scheme { get; set; } - - public int StatusCode { get; set; } - - public ClaimsPrincipal User { get; set; } - - public string Method { get; set; } - - public string Protocol { get; set; } - - public IHeaderDictionary Headers { get; set; } - - public QueryString Query { get; set; } - - public IRequestCookieCollection Cookies { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs deleted file mode 100644 index 16a6da4064..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Http.Features; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - internal class HttpRequestIdentifierFeature : IHttpRequestIdentifierFeature - { - public string TraceIdentifier { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs deleted file mode 100644 index e1484fd242..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class LogInfo - { - public ActivityContext ActivityContext { get; set; } - - public string Name { get; set; } - - public object State { get; set; } - - public Exception Exception { get; set; } - - public string Message { get; set; } - - public LogLevel Severity { get; set; } - - public int EventID { get; set; } - - public DateTimeOffset Time { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj deleted file mode 100644 index a636ddd88f..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs. - $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) - false - $(ExperimentalPackageVersion) - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;diagnostics - - - - - - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs deleted file mode 100644 index e004ffc5ae..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - internal class RequestIdentifier : IDisposable - { - private readonly bool _addedFeature; - private readonly bool _updatedIdentifier; - private readonly string _originalIdentifierValue; - private readonly HttpContext _context; - private readonly IHttpRequestIdentifierFeature _feature; - - private RequestIdentifier(HttpContext context) - { - _context = context; - _feature = context.Features.Get(); - - if (_feature == null) - { - _feature = new HttpRequestIdentifierFeature() - { - TraceIdentifier = Guid.NewGuid().ToString() - }; - context.Features.Set(_feature); - _addedFeature = true; - } - else if (string.IsNullOrEmpty(_feature.TraceIdentifier)) - { - _originalIdentifierValue = _feature.TraceIdentifier; - _feature.TraceIdentifier = Guid.NewGuid().ToString(); - _updatedIdentifier = true; - } - } - - public static IDisposable Ensure(HttpContext context) - { - return new RequestIdentifier(context); - } - - public void Dispose() - { - if (_addedFeature) - { - _context.Features.Set(null); - } - else if (_updatedIdentifier) - { - _feature.TraceIdentifier = _originalIdentifierValue; - } - } - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs deleted file mode 100644 index 101dad091f..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - public class ScopeNode - { - public ScopeNode Parent { get; set; } - - public List Children { get; private set; } = new List(); - - public List Messages { get; private set; } = new List(); - - public DateTimeOffset StartTime { get; set; } - - public DateTimeOffset EndTime { get; set; } - - public object State { get; set; } - - public string Name { get; set; } - - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs deleted file mode 100644 index db0a8c8304..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Diagnostics.Elm -{ - /// - /// Options for viewing elm logs. - /// - public class ViewOptions - { - /// - /// The minimum of logs shown on the elm page. - /// - public LogLevel MinLevel { get; set; } - - /// - /// The prefix for the logger names of logs shown on the elm page. - /// - public string NamePrefix { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs deleted file mode 100644 index d1f50f01b0..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs +++ /dev/null @@ -1,541 +0,0 @@ -// -#pragma warning disable 1591 -namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews -{ - #line hidden -#line 1 "DetailsPage.cshtml" -using System; - -#line default -#line hidden - using System.Threading.Tasks; -#line 2 "DetailsPage.cshtml" -using System.Globalization; - -#line default -#line hidden -#line 3 "DetailsPage.cshtml" -using System.Linq; - -#line default -#line hidden -#line 4 "DetailsPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm; - -#line default -#line hidden -#line 5 "DetailsPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews; - -#line default -#line hidden -#line 6 "DetailsPage.cshtml" -using Microsoft.Extensions.RazorViews; - -#line default -#line hidden -#line 7 "DetailsPage.cshtml" -using Microsoft.Extensions.Logging; - -#line default -#line hidden - internal class DetailsPage : Microsoft.Extensions.RazorViews.BaseView - { - #pragma warning disable 1998 - public async override global::System.Threading.Tasks.Task ExecuteAsync() - { - WriteLiteral("\r\n"); -#line 86 "DetailsPage.cshtml" - - Response.ContentType = "text/html; charset=utf-8"; - -#line default -#line hidden - WriteLiteral(@" - - - - ASP.NET Core Logs - - - - -

ASP.NET Core Logs

-"); -#line 194 "DetailsPage.cshtml" - - var context = Model.Activity?.HttpInfo; - - -#line default -#line hidden - WriteLiteral(" "); -#line 197 "DetailsPage.cshtml" - if (context != null) - { - -#line default -#line hidden - WriteLiteral("

Request Details

\r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n - - - - \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Path"); -#line 205 "DetailsPage.cshtml" - Write(context.Path); - -#line default -#line hidden - WriteLiteral("
Host"); -#line 209 "DetailsPage.cshtml" - Write(context.Host); - -#line default -#line hidden - WriteLiteral("
Content Type"); -#line 213 "DetailsPage.cshtml" - Write(context.ContentType); - -#line default -#line hidden - WriteLiteral("
Method"); -#line 217 "DetailsPage.cshtml" - Write(context.Method); - -#line default -#line hidden - WriteLiteral("
Protocol"); -#line 221 "DetailsPage.cshtml" - Write(context.Protocol); - -#line default -#line hidden - WriteLiteral(@"
Headers - - - - - - - - -"); -#line 234 "DetailsPage.cshtml" - foreach (var header in context.Headers) - { - -#line default -#line hidden - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 240 "DetailsPage.cshtml" - } - -#line default -#line hidden - WriteLiteral(" \r\n
VariableValue
"); -#line 237 "DetailsPage.cshtml" - Write(header.Key); - -#line default -#line hidden - WriteLiteral(""); -#line 238 "DetailsPage.cshtml" - Write(string.Join(";", header.Value)); - -#line default -#line hidden - WriteLiteral("
\r\n
Status Code"); -#line 247 "DetailsPage.cshtml" - Write(context.StatusCode); - -#line default -#line hidden - WriteLiteral("
User"); -#line 251 "DetailsPage.cshtml" - Write(context.User.Identity.Name); - -#line default -#line hidden - WriteLiteral("
Claims\r\n"); -#line 256 "DetailsPage.cshtml" - if (context.User.Claims.Any()) - { - -#line default -#line hidden - WriteLiteral(@" - - - - - - - -"); -#line 266 "DetailsPage.cshtml" - foreach (var claim in context.User.Claims) - { - -#line default -#line hidden - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 272 "DetailsPage.cshtml" - } - -#line default -#line hidden - WriteLiteral(" \r\n
IssuerValue
"); -#line 269 "DetailsPage.cshtml" - Write(claim.Issuer); - -#line default -#line hidden - WriteLiteral(""); -#line 270 "DetailsPage.cshtml" - Write(claim.Value); - -#line default -#line hidden - WriteLiteral("
\r\n"); -#line 275 "DetailsPage.cshtml" - } - -#line default -#line hidden - WriteLiteral("
Scheme"); -#line 280 "DetailsPage.cshtml" - Write(context.Scheme); - -#line default -#line hidden - WriteLiteral("
Query"); -#line 284 "DetailsPage.cshtml" - Write(context.Query.Value); - -#line default -#line hidden - WriteLiteral("
Cookies\r\n"); -#line 289 "DetailsPage.cshtml" - if (context.Cookies.Any()) - { - -#line default -#line hidden - WriteLiteral(@" - - - - - - - -"); -#line 299 "DetailsPage.cshtml" - foreach (var cookie in context.Cookies) - { - -#line default -#line hidden - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 305 "DetailsPage.cshtml" - } - -#line default -#line hidden - WriteLiteral(" \r\n
VariableValue
"); -#line 302 "DetailsPage.cshtml" - Write(cookie.Key); - -#line default -#line hidden - WriteLiteral(""); -#line 303 "DetailsPage.cshtml" - Write(string.Join(";", cookie.Value)); - -#line default -#line hidden - WriteLiteral("
\r\n"); -#line 308 "DetailsPage.cshtml" - } - -#line default -#line hidden - WriteLiteral("
\r\n"); -#line 312 "DetailsPage.cshtml" - } - -#line default -#line hidden - WriteLiteral("

Logs

\r\n
\r\n \r\n - -
- - - - - - - - - - - - "); -#line 343 "DetailsPage.cshtml" - Write(Traverse(Model.Activity.Root)); - -#line default -#line hidden - WriteLiteral(@" -
DateTimeSeverityNameStateError
- - -"); - } - #pragma warning restore 1998 -#line 10 "DetailsPage.cshtml" - - public DetailsPage(DetailsPageModel model) - { - Model = model; - } - - public DetailsPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - PushWriter(writer); - WriteLiteral(" \r\n "); - Write(string.Format("{0:MM/dd/yy}", log.Time)); - WriteLiteral("\r\n "); - Write(string.Format("{0:H:mm:ss}", log.Time)); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteral($"\r\n "); - Write(log.Severity); - - WriteLiteral($"\r\n "); - Write(log.Name); - - WriteLiteral($"\r\n "); - Write(log.Message); - - WriteLiteral($"\r\n "); - Write(log.Exception); - - WriteLiteral("\r\n \r\n"); - PopWriter(); - } - }); - } - - public HelperResult Traverse(ScopeNode node) - { - return new HelperResult((writer) => - { - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - LogRow(node.Messages[messageIndex]); - messageIndex++; - } - else - { - Traverse(node.Children[childIndex]); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - LogRow(node.Messages[i]); - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - Traverse(node.Children[i]); - } - } - }); - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml deleted file mode 100644 index 76180ed102..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml +++ /dev/null @@ -1,260 +0,0 @@ -@using System -@using System.Globalization -@using System.Linq -@using Microsoft.AspNetCore.Diagnostics.Elm -@using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews -@using Microsoft.Extensions.RazorViews -@using Microsoft.Extensions.Logging - -@functions -{ - public DetailsPage(DetailsPageModel model) - { - Model = model; - } - - public DetailsPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - PushWriter(writer); - WriteLiteral(" \r\n "); - Write(string.Format("{0:MM/dd/yy}", log.Time)); - WriteLiteral("\r\n "); - Write(string.Format("{0:H:mm:ss}", log.Time)); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteral($"\r\n "); - Write(log.Severity); - - WriteLiteral($"\r\n "); - Write(log.Name); - - WriteLiteral($"\r\n "); - Write(log.Message); - - WriteLiteral($"\r\n "); - Write(log.Exception); - - WriteLiteral("\r\n \r\n"); - PopWriter(); - } - }); - } - - public HelperResult Traverse(ScopeNode node) - { - return new HelperResult((writer) => - { - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - LogRow(node.Messages[messageIndex]); - messageIndex++; - } - else - { - Traverse(node.Children[childIndex]); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - LogRow(node.Messages[i]); - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - Traverse(node.Children[i]); - } - } - }); - } -} -@{ - Response.ContentType = "text/html; charset=utf-8"; -} - - - - - ASP.NET Core Logs - - - - -

ASP.NET Core Logs

- @{ - var context = Model.Activity?.HttpInfo; - } - @if (context != null) - { -

Request Details

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path@context.Path
Host@context.Host
Content Type@context.ContentType
Method@context.Method
Protocol@context.Protocol
Headers - - - - - - - - - @foreach (var header in context.Headers) - { - - - - - } - -
VariableValue
@header.Key@string.Join(";", header.Value)
-
Status Code@context.StatusCode
User@context.User.Identity.Name
Claims - @if (context.User.Claims.Any()) - { - - - - - - - - - @foreach (var claim in context.User.Claims) - { - - - - - } - -
IssuerValue
@claim.Issuer@claim.Value
- } -
Scheme@context.Scheme
Query@context.Query.Value
Cookies - @if (context.Cookies.Any()) - { - - - - - - - - - @foreach (var cookie in context.Cookies) - { - - - - - } - -
VariableValue
@cookie.Key@string.Join(";", cookie.Value)
- } -
- } -

Logs

-
- - - -
- - - - - - - - - - - - @Traverse(Model.Activity.Root) -
DateTimeSeverityNameStateError
- - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.css deleted file mode 100644 index d0803ebf3f..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.css +++ /dev/null @@ -1,56 +0,0 @@ -body { - font-size: 0.9em; - width: 90%; - margin: 0px auto; -} - -h1 { - padding-bottom: 10px; -} - -h2 { - font-weight: normal; -} - -table { - border-spacing: 0px; - width: 100%; - border-collapse: collapse; - border: 1px solid black; - white-space: pre-wrap; -} - -th { - font-family: Arial; -} - -td, th { - padding: 8px; -} - -#headerTable, #cookieTable { - border: none; - height: 100%; -} - -#headerTd { - white-space: normal; -} - -#label { - width: 20%; - border-right: 1px solid black; -} - -#logs{ - margin-top: 10px; - margin-bottom: 20px; -} - -#logs>tbody>tr>td { - border-right: 1px dashed lightgray; -} - -#logs>thead>tr>th { - border: 1px solid black; -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs deleted file mode 100644 index 1b9c2a64b0..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews -{ - public class DetailsPageModel - { - public ActivityContext Activity { get; set; } - - public ViewOptions Options { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs deleted file mode 100644 index 1889ca3139..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs +++ /dev/null @@ -1,651 +0,0 @@ -// -#pragma warning disable 1591 -namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews -{ - #line hidden -#line 1 "LogPage.cshtml" -using System; - -#line default -#line hidden - using System.Threading.Tasks; -#line 2 "LogPage.cshtml" -using System.Collections.Generic; - -#line default -#line hidden -#line 3 "LogPage.cshtml" -using System.Globalization; - -#line default -#line hidden -#line 4 "LogPage.cshtml" -using System.Linq; - -#line default -#line hidden -#line 5 "LogPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm; - -#line default -#line hidden -#line 6 "LogPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews; - -#line default -#line hidden -#line 7 "LogPage.cshtml" -using Microsoft.Extensions.RazorViews; - -#line default -#line hidden -#line 8 "LogPage.cshtml" -using Microsoft.Extensions.Logging; - -#line default -#line hidden - internal class LogPage : Microsoft.Extensions.RazorViews.BaseView - { - #pragma warning disable 1998 - public async override global::System.Threading.Tasks.Task ExecuteAsync() - { - WriteLiteral("\r\n"); -#line 118 "LogPage.cshtml" - - Response.ContentType = "text/html; charset=utf-8"; - -#line default -#line hidden - WriteLiteral(@" - - - - - ASP.NET Core Logs - - \r\n\r\n\r\n

ASP.NET Core Logs

\r\n
\r\n \r\n - -
-
- -
- - - - - - - - - - - - - - - - - - -"); -#line 321 "LogPage.cshtml" - foreach (var activity in Model.Activities.Reverse()) - { - -#line default -#line hidden - WriteLiteral(" \r\n \r\n"); -#line 325 "LogPage.cshtml" - - var activityPath = Model.Path.Value + "/" + activity.Id; - if (activity.HttpInfo != null) - { - -#line default -#line hidden - WriteLiteral(" \t\r\n \r\n \r\n \r\n"); -#line 333 "LogPage.cshtml" - } - else if (activity.RepresentsScope) - { - -#line default -#line hidden - WriteLiteral(" \r\n"); -#line 337 "LogPage.cshtml" - } - else - { - -#line default -#line hidden - WriteLiteral(" \r\n"); -#line 341 "LogPage.cshtml" - } - - -#line default -#line hidden - WriteLiteral(@" \r\n \r\n \r\n"); -#line 395 "LogPage.cshtml" - } - -#line default -#line hidden - WriteLiteral(@"
PathMethodHostStatus CodeLogs
"); -#line 330 "LogPage.cshtml" - Write(activity.HttpInfo.Method); - -#line default -#line hidden - WriteLiteral(""); -#line 331 "LogPage.cshtml" - Write(activity.HttpInfo.Host); - -#line default -#line hidden - WriteLiteral(""); -#line 332 "LogPage.cshtml" - Write(activity.HttpInfo.StatusCode); - -#line default -#line hidden - WriteLiteral(" - - - - - - - - - - - -"); -#line 355 "LogPage.cshtml" - - var counts = new Dictionary(); - counts["Critical"] = 0; - counts["Error"] = 0; - counts["Warning"] = 0; - counts["Information"] = 0; - counts["Debug"] = 0; - - -#line default -#line hidden - WriteLiteral(" \r\n"); -#line 364 "LogPage.cshtml" - if (!activity.RepresentsScope) - { - // message not within a scope - var logInfo = activity.Root.Messages.FirstOrDefault(); - - -#line default -#line hidden -#line 368 "LogPage.cshtml" - Write(LogRow(logInfo, 0)); - -#line default -#line hidden -#line 368 "LogPage.cshtml" - - counts[logInfo.Severity.ToString()] = 1; - } - else - { - - -#line default -#line hidden -#line 373 "LogPage.cshtml" - Write(Traverse(activity.Root, 0, counts)); - -#line default -#line hidden -#line 373 "LogPage.cshtml" - - } - -#line default -#line hidden - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 379 "LogPage.cshtml" - foreach (var kvp in counts) - { - if (string.Equals("Debug", kvp.Key)) { - -#line default -#line hidden - WriteLiteral(" \r\n"); -#line 383 "LogPage.cshtml" - } - else - { - -#line default -#line hidden - WriteLiteral(" \r\n"); -#line 387 "LogPage.cshtml" - } - } - -#line default -#line hidden - WriteLiteral(" \r\n \r\n
DateTimeNameSeverityStateError^
"); -#line 378 "LogPage.cshtml" - Write(activity.Time.ToString("MM-dd-yyyy HH:mm:ss")); - -#line default -#line hidden - WriteLiteral(""); -#line 382 "LogPage.cshtml" - Write(kvp.Value); - -#line default -#line hidden - WriteLiteral(" "); -#line 382 "LogPage.cshtml" - Write(kvp.Key); - -#line default -#line hidden - WriteLiteral("v"); -#line 386 "LogPage.cshtml" - Write(kvp.Value); - -#line default -#line hidden - WriteLiteral(" "); -#line 386 "LogPage.cshtml" - Write(kvp.Key); - -#line default -#line hidden - WriteLiteral("
\r\n
- - -"); - } - #pragma warning restore 1998 -#line 11 "LogPage.cshtml" - - public LogPage(LogPageModel model) - { - Model = model; - } - - public LogPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log, int level) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - PushWriter(writer); - WriteLiteral(" \r\n "); - Write(string.Format("{0:MM/dd/yy}", log.Time)); - - WriteLiteral("\r\n "); - Write(string.Format("{0:H:mm:ss}", log.Time)); - - WriteLiteral($"\r\n "); - Write(log.Name); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteral($"\r\n "); - Write(log.Severity); - - WriteLiteral($"\r\n \r\n"); - - for (var i = 0; i < level; i++) - { - WriteLiteral(" \r\n"); - } - - WriteLiteral(" "); - Write(log.Message); - - WriteLiteral($"\r\n \r\n "); - - Write(log.Exception); - - WriteLiteral("\r\n \r\n"); - PopWriter(); - } - }); - } - - public HelperResult Traverse(ScopeNode node, int level, Dictionary counts) - { - return new HelperResult((writer) => { - PushWriter(writer); - - // print start of scope - Write(LogRow(new LogInfo() - { - Name = node.Name, - Time = node.StartTime, - Severity = LogLevel.Debug, - Message = "Beginning " + node.State, - }, level)); - - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - Write(LogRow(node.Messages[messageIndex], level)); - - counts[node.Messages[messageIndex].Severity.ToString()]++; - messageIndex++; - } - else - { - Write(Traverse(node.Children[childIndex], level + 1, counts)); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - Write(LogRow(node.Messages[i], level)); - counts[node.Messages[i].Severity.ToString()]++; - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - Write(Traverse(node.Children[i], level + 1, counts)); - } - } - // print end of scope - Write(LogRow(new LogInfo() - { - Name = node.Name, - Time = node.EndTime, - Severity = LogLevel.Debug, - Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime) - }, level)); - - PopWriter(); - }); - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml deleted file mode 100644 index 4209d6a100..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml +++ /dev/null @@ -1,267 +0,0 @@ -@using System -@using System.Collections.Generic -@using System.Globalization -@using System.Linq -@using Microsoft.AspNetCore.Diagnostics.Elm -@using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews -@using Microsoft.Extensions.RazorViews -@using Microsoft.Extensions.Logging - -@functions -{ - public LogPage(LogPageModel model) - { - Model = model; - } - - public LogPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log, int level) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - PushWriter(writer); - WriteLiteral(" \r\n "); - Write(string.Format("{0:MM/dd/yy}", log.Time)); - - WriteLiteral("\r\n "); - Write(string.Format("{0:H:mm:ss}", log.Time)); - - WriteLiteral($"\r\n "); - Write(log.Name); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteral($"\r\n "); - Write(log.Severity); - - WriteLiteral($"\r\n \r\n"); - - for (var i = 0; i < level; i++) - { - WriteLiteral(" \r\n"); - } - - WriteLiteral(" "); - Write(log.Message); - - WriteLiteral($"\r\n \r\n "); - - Write(log.Exception); - - WriteLiteral("\r\n \r\n"); - PopWriter(); - } - }); - } - - public HelperResult Traverse(ScopeNode node, int level, Dictionary counts) - { - return new HelperResult((writer) => { - PushWriter(writer); - - // print start of scope - Write(LogRow(new LogInfo() - { - Name = node.Name, - Time = node.StartTime, - Severity = LogLevel.Debug, - Message = "Beginning " + node.State, - }, level)); - - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - Write(LogRow(node.Messages[messageIndex], level)); - - counts[node.Messages[messageIndex].Severity.ToString()]++; - messageIndex++; - } - else - { - Write(Traverse(node.Children[childIndex], level + 1, counts)); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - Write(LogRow(node.Messages[i], level)); - counts[node.Messages[i].Severity.ToString()]++; - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - Write(Traverse(node.Children[i], level + 1, counts)); - } - } - // print end of scope - Write(LogRow(new LogInfo() - { - Name = node.Name, - Time = node.EndTime, - Severity = LogLevel.Debug, - Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime) - }, level)); - - PopWriter(); - }); - } -} -@{ - Response.ContentType = "text/html; charset=utf-8"; -} - - - - - - ASP.NET Core Logs - - - - -

ASP.NET Core Logs

-
- - - -
-
- -
- - - - - - - - - - - - - - - - - - - @foreach (var activity in Model.Activities.Reverse()) - { - - - @{ - var activityPath = Model.Path.Value + "/" + activity.Id; - if (activity.HttpInfo != null) - { - - - - - } - else if (activity.RepresentsScope) - { - - } - else - { - - } - } - - - - } -
PathMethodHostStatus CodeLogs
@activity.HttpInfo.Path@activity.HttpInfo.Method@activity.HttpInfo.Host@activity.HttpInfo.StatusCode@activity.Root.StateNon-scope Log - - - - - - - - - - - - @{ - var counts = new Dictionary(); - counts["Critical"] = 0; - counts["Error"] = 0; - counts["Warning"] = 0; - counts["Information"] = 0; - counts["Debug"] = 0; - } - - @if (!activity.RepresentsScope) - { - // message not within a scope - var logInfo = activity.Root.Messages.FirstOrDefault(); - @LogRow(logInfo, 0) - counts[logInfo.Severity.ToString()] = 1; - } - else - { - @Traverse(activity.Root, 0, counts) - } - - - - - @foreach (var kvp in counts) - { - if (string.Equals("Debug", kvp.Key)) { - - } - else - { - - } - } - - -
DateTimeNameSeverityStateError^
@activity.Time.ToString("MM-dd-yyyy HH:mm:ss")@kvp.Value @kvp.Keyv@kvp.Value @kvp.Key
-
- - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.css deleted file mode 100644 index 420cc18121..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.css +++ /dev/null @@ -1,110 +0,0 @@ -body { - font-size: .813em; - white-space: nowrap; - margin: 20px; -} - -col:nth-child(2n) { - background-color: #FAFAFA; -} - -form { - display: inline-block; -} - -h1 { - margin-left: 25px; -} - -table { - margin: 0px auto; - border-collapse: collapse; - border-spacing: 0px; - table-layout: fixed; - width: 100%; -} - -td, th { - padding: 4px; -} - -thead { - font-size: 1em; - font-family: Arial; -} - -tr { - height: 23px; -} - -#requestHeader { - border-bottom: solid 1px gray; - border-top: solid 1px gray; - margin-bottom: 2px; - font-size: 1em; - line-height: 2em; -} - -.collapse { - color: black; - float: right; - font-weight: normal; - width: 1em; -} - -.date, .time { - width: 70px; -} - -.logHeader { - border-bottom: 1px solid lightgray; - color: gray; - text-align: left; -} - -.logState { - text-overflow: ellipsis; - overflow: hidden; -} - -.logTd { - border-left: 1px solid gray; - padding: 0px; -} - -.logs { - width: 80%; -} - -.logRow:hover { - background-color: #D6F5FF; -} - -.requestRow>td { - border-bottom: solid 1px gray; -} - -.severity { - width: 80px; -} - -.summary { - color: black; - line-height: 1.8em; -} - -.summary>th { - font-weight: normal; -} - -.tab { - margin-left: 30px; -} - -#viewOptions { - margin: 20px; -} - -#viewOptions > * { - margin: 5px; -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs deleted file mode 100644 index 46c20d9689..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using Microsoft.AspNetCore.Http; - -namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews -{ - public class LogPageModel - { - public IEnumerable Activities { get; set; } - - public ViewOptions Options { get; set; } - - public PathString Path { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cs deleted file mode 100644 index df09b8eca9..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cs +++ /dev/null @@ -1,512 +0,0 @@ -namespace Microsoft.AspNetCore.Diagnostics.Elm.Views -{ -#line 1 "DetailsPage.cshtml" -using System - -#line default -#line hidden - ; -#line 2 "DetailsPage.cshtml" -using System.Globalization - -#line default -#line hidden - ; -#line 3 "DetailsPage.cshtml" -using System.Linq - -#line default -#line hidden - ; -#line 4 "DetailsPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm - -#line default -#line hidden - ; -#line 5 "DetailsPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm.Views - -#line default -#line hidden - ; -#line 6 "DetailsPage.cshtml" -using Microsoft.AspNetCore.DiagnosticsViewPage.Views - -#line default -#line hidden - ; -#line 7 "DetailsPage.cshtml" -using Microsoft.Extensions.Logging - -#line default -#line hidden - ; - using System.Threading.Tasks; - [Obsolete("This type is for internal use only and will be removed in a future version.")] - public class DetailsPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView - { -#line 10 "DetailsPage.cshtml" - - public DetailsPage(DetailsPageModel model) - { - Model = model; - } - - public DetailsPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - WriteLiteralTo(writer, " \r\n "); - WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time)); - WriteLiteralTo(writer, "\r\n "); - WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time)); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Severity); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Name); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Message); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Exception); - - WriteLiteralTo(writer, "\r\n \r\n"); - } - }); - } - - public HelperResult Traverse(ScopeNode node) - { - return new HelperResult((writer) => - { - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - LogRow(node.Messages[messageIndex]); - messageIndex++; - } - else - { - Traverse(node.Children[childIndex]); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - LogRow(node.Messages[i]); - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - Traverse(node.Children[i]); - } - } - }); - } - -#line default -#line hidden - #line hidden - public DetailsPage() - { - } - - #pragma warning disable 1998 - public override async Task ExecuteAsync() - { - WriteLiteral("\r\n"); -#line 84 "DetailsPage.cshtml" - - Response.ContentType = "text/html"; - -#line default -#line hidden - - WriteLiteral(@" - - - - ASP.NET Core Logs - - - - -

ASP.NET Core Logs

-"); -#line 99 "DetailsPage.cshtml" - - -#line default -#line hidden - -#line 99 "DetailsPage.cshtml" - - var context = Model.Activity?.HttpInfo; - - -#line default -#line hidden - - WriteLiteral(" "); -#line 102 "DetailsPage.cshtml" - if (context != null) - { - -#line default -#line hidden - - WriteLiteral("

Request Details

\r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n - - - - \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Path"); -#line 110 "DetailsPage.cshtml" - Write(context.Path); - -#line default -#line hidden - WriteLiteral("
Host"); -#line 114 "DetailsPage.cshtml" - Write(context.Host); - -#line default -#line hidden - WriteLiteral("
Content Type"); -#line 118 "DetailsPage.cshtml" - Write(context.ContentType); - -#line default -#line hidden - WriteLiteral("
Method"); -#line 122 "DetailsPage.cshtml" - Write(context.Method); - -#line default -#line hidden - WriteLiteral("
Protocol"); -#line 126 "DetailsPage.cshtml" - Write(context.Protocol); - -#line default -#line hidden - WriteLiteral(@"
Headers - - - - - - - - -"); -#line 139 "DetailsPage.cshtml" - - -#line default -#line hidden - -#line 139 "DetailsPage.cshtml" - foreach (var header in context.Headers) - { - -#line default -#line hidden - - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 145 "DetailsPage.cshtml" - } - -#line default -#line hidden - - WriteLiteral(" \r\n
VariableValue
"); -#line 142 "DetailsPage.cshtml" - Write(header.Key); - -#line default -#line hidden - WriteLiteral(""); -#line 143 "DetailsPage.cshtml" - Write(string.Join(";", header.Value)); - -#line default -#line hidden - WriteLiteral("
\r\n
Status Code"); -#line 152 "DetailsPage.cshtml" - Write(context.StatusCode); - -#line default -#line hidden - WriteLiteral("
User"); -#line 156 "DetailsPage.cshtml" - Write(context.User.Identity.Name); - -#line default -#line hidden - WriteLiteral("
Claims\r\n"); -#line 161 "DetailsPage.cshtml" - - -#line default -#line hidden - -#line 161 "DetailsPage.cshtml" - if (context.User.Claims.Any()) - { - -#line default -#line hidden - - WriteLiteral(@" - - - - - - - -"); -#line 171 "DetailsPage.cshtml" - - -#line default -#line hidden - -#line 171 "DetailsPage.cshtml" - foreach (var claim in context.User.Claims) - { - -#line default -#line hidden - - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 177 "DetailsPage.cshtml" - } - -#line default -#line hidden - - WriteLiteral(" \r\n
IssuerValue
"); -#line 174 "DetailsPage.cshtml" - Write(claim.Issuer); - -#line default -#line hidden - WriteLiteral(""); -#line 175 "DetailsPage.cshtml" - Write(claim.Value); - -#line default -#line hidden - WriteLiteral("
\r\n"); -#line 180 "DetailsPage.cshtml" - } - -#line default -#line hidden - - WriteLiteral("
Scheme"); -#line 185 "DetailsPage.cshtml" - Write(context.Scheme); - -#line default -#line hidden - WriteLiteral("
Query"); -#line 189 "DetailsPage.cshtml" - Write(context.Query.Value); - -#line default -#line hidden - WriteLiteral("
Cookies\r\n"); -#line 194 "DetailsPage.cshtml" - - -#line default -#line hidden - -#line 194 "DetailsPage.cshtml" - if (context.Cookies.Any()) - { - -#line default -#line hidden - - WriteLiteral(@" - - - - - - - -"); -#line 204 "DetailsPage.cshtml" - - -#line default -#line hidden - -#line 204 "DetailsPage.cshtml" - foreach (var cookie in context.Cookies) - { - -#line default -#line hidden - - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 210 "DetailsPage.cshtml" - } - -#line default -#line hidden - - WriteLiteral(" \r\n
VariableValue
"); -#line 207 "DetailsPage.cshtml" - Write(cookie.Key); - -#line default -#line hidden - WriteLiteral(""); -#line 208 "DetailsPage.cshtml" - Write(string.Join(";", cookie.Value)); - -#line default -#line hidden - WriteLiteral("
\r\n"); -#line 213 "DetailsPage.cshtml" - } - -#line default -#line hidden - - WriteLiteral("
\r\n"); -#line 217 "DetailsPage.cshtml" - } - -#line default -#line hidden - - WriteLiteral("

Logs

\r\n
\r\n \r\n - -
- - - - - - - - - - - - "); -#line 248 "DetailsPage.cshtml" - Write(Traverse(Model.Activity.Root)); - -#line default -#line hidden - WriteLiteral(@" -
DateTimeSeverityNameStateError
- - -"); - } - #pragma warning restore 1998 - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cshtml deleted file mode 100644 index db56b731e1..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.cshtml +++ /dev/null @@ -1,258 +0,0 @@ -@using System -@using System.Globalization -@using System.Linq -@using Microsoft.AspNetCore.Diagnostics.Elm -@using Microsoft.AspNetCore.Diagnostics.Elm.Views -@using Microsoft.AspNetCore.DiagnosticsViewPage.Views -@using Microsoft.Extensions.Logging - -@functions -{ - public DetailsPage(DetailsPageModel model) - { - Model = model; - } - - public DetailsPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - WriteLiteralTo(writer, " \r\n "); - WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time)); - WriteLiteralTo(writer, "\r\n "); - WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time)); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Severity); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Name); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Message); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Exception); - - WriteLiteralTo(writer, "\r\n \r\n"); - } - }); - } - - public HelperResult Traverse(ScopeNode node) - { - return new HelperResult((writer) => - { - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - LogRow(node.Messages[messageIndex]); - messageIndex++; - } - else - { - Traverse(node.Children[childIndex]); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - LogRow(node.Messages[i]); - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - Traverse(node.Children[i]); - } - } - }); - } -} -@{ - Response.ContentType = "text/html"; -} - - - - - ASP.NET Core Logs - - - - -

ASP.NET Core Logs

- @{ - var context = Model.Activity?.HttpInfo; - } - @if (context != null) - { -

Request Details

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path@context.Path
Host@context.Host
Content Type@context.ContentType
Method@context.Method
Protocol@context.Protocol
Headers - - - - - - - - - @foreach (var header in context.Headers) - { - - - - - } - -
VariableValue
@header.Key@string.Join(";", header.Value)
-
Status Code@context.StatusCode
User@context.User.Identity.Name
Claims - @if (context.User.Claims.Any()) - { - - - - - - - - - @foreach (var claim in context.User.Claims) - { - - - - - } - -
IssuerValue
@claim.Issuer@claim.Value
- } -
Scheme@context.Scheme
Query@context.Query.Value
Cookies - @if (context.Cookies.Any()) - { - - - - - - - - - @foreach (var cookie in context.Cookies) - { - - - - - } - -
VariableValue
@cookie.Key@string.Join(";", cookie.Value)
- } -
- } -

Logs

-
- - - -
- - - - - - - - - - - - @Traverse(Model.Activity.Root) -
DateTimeSeverityNameStateError
- - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.css deleted file mode 100644 index d0803ebf3f..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPage.css +++ /dev/null @@ -1,56 +0,0 @@ -body { - font-size: 0.9em; - width: 90%; - margin: 0px auto; -} - -h1 { - padding-bottom: 10px; -} - -h2 { - font-weight: normal; -} - -table { - border-spacing: 0px; - width: 100%; - border-collapse: collapse; - border: 1px solid black; - white-space: pre-wrap; -} - -th { - font-family: Arial; -} - -td, th { - padding: 8px; -} - -#headerTable, #cookieTable { - border: none; - height: 100%; -} - -#headerTd { - white-space: normal; -} - -#label { - width: 20%; - border-right: 1px solid black; -} - -#logs{ - margin-top: 10px; - margin-bottom: 20px; -} - -#logs>tbody>tr>td { - border-right: 1px dashed lightgray; -} - -#logs>thead>tr>th { - border: 1px solid black; -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPageModel.cs deleted file mode 100644 index 5ae8e15579..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/DetailsPageModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace Microsoft.AspNetCore.Diagnostics.Elm.Views -{ - [Obsolete("This type is for internal use only and will be removed in a future version.")] - public class DetailsPageModel - { - public ActivityContext Activity { get; set; } - - public ViewOptions Options { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cs deleted file mode 100644 index 4108ebe4db..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cs +++ /dev/null @@ -1,579 +0,0 @@ -namespace Microsoft.AspNetCore.Diagnostics.Elm.Views -{ -#line 1 "LogPage.cshtml" -using System - -#line default -#line hidden - ; -#line 2 "LogPage.cshtml" -using System.Collections.Generic - -#line default -#line hidden - ; -#line 3 "LogPage.cshtml" -using System.Globalization - -#line default -#line hidden - ; -#line 4 "LogPage.cshtml" -using System.Linq - -#line default -#line hidden - ; -#line 5 "LogPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm - -#line default -#line hidden - ; -#line 6 "LogPage.cshtml" -using Microsoft.AspNetCore.Diagnostics.Elm.Views - -#line default -#line hidden - ; -#line 7 "LogPage.cshtml" -using Microsoft.AspNetCore.DiagnosticsViewPage.Views - -#line default -#line hidden - ; -#line 8 "LogPage.cshtml" -using Microsoft.Extensions.Logging - -#line default -#line hidden - ; - using System.Threading.Tasks; - [Obsolete("This type is for internal use only and will be removed in a future version.")] - public class LogPage : Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView - { -#line 11 "LogPage.cshtml" - - public LogPage(LogPageModel model) - { - Model = model; - } - - public LogPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log, int level) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - - WriteLiteralTo(writer, " \r\n "); - WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time)); - - WriteLiteralTo(writer, "\r\n "); - WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time)); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Name); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Severity); - - WriteLiteralTo(writer, $"\r\n \r\n"); - - for (var i = 0; i < level; i++) - { - WriteLiteralTo(writer, " \r\n"); - } - - WriteLiteralTo(writer, " "); - WriteTo(writer, log.Message); - - WriteLiteralTo(writer, $"\r\n \r\n "); - - WriteTo(writer, log.Exception); - - WriteLiteralTo(writer, "\r\n \r\n"); - - } - }); - } - - public HelperResult Traverse(ScopeNode node, int level, Dictionary counts) - { - return new HelperResult((writer) => { - // print start of scope - WriteTo(writer, LogRow(new LogInfo() - { - Name = node.Name, - Time = node.StartTime, - Severity = LogLevel.Debug, - Message = "Beginning " + node.State, - }, level)); - - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - WriteTo(writer, LogRow(node.Messages[messageIndex], level)); - - counts[node.Messages[messageIndex].Severity.ToString()]++; - messageIndex++; - } - else - { - WriteTo(writer, Traverse(node.Children[childIndex], level + 1, counts)); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - WriteTo(writer, LogRow(node.Messages[i], level)); - counts[node.Messages[i].Severity.ToString()]++; - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - WriteTo(writer, Traverse(node.Children[i], level + 1, counts)); - } - } - // print end of scope - WriteTo(writer, LogRow(new LogInfo() - { - Name = node.Name, - Time = node.EndTime, - Severity = LogLevel.Debug, - Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime) - }, level)); - }); - } - -#line default -#line hidden - #line hidden - public LogPage() - { - } - - #pragma warning disable 1998 - public override async Task ExecuteAsync() - { - WriteLiteral("\r\n"); -#line 114 "LogPage.cshtml" - - Response.ContentType = "text/html"; - -#line default -#line hidden - - WriteLiteral(@" - - - - - ASP.NET Core Logs - - - - -

ASP.NET Core Logs

-
- \r\n - -
-
- -
- - - - - - - - - - - - - - - - - - -"); -#line 170 "LogPage.cshtml" - - -#line default -#line hidden - -#line 170 "LogPage.cshtml" - foreach (var activity in Model.Activities.Reverse()) - { - -#line default -#line hidden - - WriteLiteral(" \r\n \r\n"); -#line 174 "LogPage.cshtml" - - -#line default -#line hidden - -#line 174 "LogPage.cshtml" - - var activityPath = Model.Path.Value + "/" + activity.Id; - if (activity.HttpInfo != null) - { - -#line default -#line hidden - - WriteLiteral(" \t\r\n \r\n \r\n \r\n"); -#line 182 "LogPage.cshtml" - } - else if (activity.RepresentsScope) - { - -#line default -#line hidden - - WriteLiteral(" \r\n"); -#line 186 "LogPage.cshtml" - } - else - { - -#line default -#line hidden - - WriteLiteral(" \r\n"); -#line 190 "LogPage.cshtml" - } - - -#line default -#line hidden - - WriteLiteral(@" \r\n \r\n \r\n"); -#line 244 "LogPage.cshtml" - } - -#line default -#line hidden - - WriteLiteral(@"
PathMethodHostStatus CodeLogs
"); -#line 179 "LogPage.cshtml" - Write(activity.HttpInfo.Method); - -#line default -#line hidden - WriteLiteral(""); -#line 180 "LogPage.cshtml" - Write(activity.HttpInfo.Host); - -#line default -#line hidden - WriteLiteral(""); -#line 181 "LogPage.cshtml" - Write(activity.HttpInfo.StatusCode); - -#line default -#line hidden - WriteLiteral(" - - - - - - - - - - - -"); -#line 204 "LogPage.cshtml" - - -#line default -#line hidden - -#line 204 "LogPage.cshtml" - - var counts = new Dictionary(); - counts["Critical"] = 0; - counts["Error"] = 0; - counts["Warning"] = 0; - counts["Information"] = 0; - counts["Debug"] = 0; - - -#line default -#line hidden - - WriteLiteral(" \r\n"); -#line 213 "LogPage.cshtml" - - -#line default -#line hidden - -#line 213 "LogPage.cshtml" - if (!activity.RepresentsScope) - { - // message not within a scope - var logInfo = activity.Root.Messages.FirstOrDefault(); - - -#line default -#line hidden - -#line 217 "LogPage.cshtml" - Write(LogRow(logInfo, 0)); - -#line default -#line hidden -#line 217 "LogPage.cshtml" - - counts[logInfo.Severity.ToString()] = 1; - } - else - { - - -#line default -#line hidden - -#line 222 "LogPage.cshtml" - Write(Traverse(activity.Root, 0, counts)); - -#line default -#line hidden -#line 222 "LogPage.cshtml" - - } - -#line default -#line hidden - - WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 228 "LogPage.cshtml" - - -#line default -#line hidden - -#line 228 "LogPage.cshtml" - foreach (var kvp in counts) - { - if (string.Equals("Debug", kvp.Key)) { - -#line default -#line hidden - - WriteLiteral(" \r\n"); -#line 232 "LogPage.cshtml" - } - else - { - -#line default -#line hidden - - WriteLiteral(" \r\n"); -#line 236 "LogPage.cshtml" - } - } - -#line default -#line hidden - - WriteLiteral(" \r\n \r\n
DateTimeNameSeverityStateError^
"); -#line 227 "LogPage.cshtml" - Write(activity.Time.ToString("MM-dd-yyyy HH:mm:ss")); - -#line default -#line hidden - WriteLiteral(""); -#line 231 "LogPage.cshtml" - Write(kvp.Value); - -#line default -#line hidden - WriteLiteral(" "); -#line 231 "LogPage.cshtml" - Write(kvp.Key); - -#line default -#line hidden - WriteLiteral("v"); -#line 235 "LogPage.cshtml" - Write(kvp.Value); - -#line default -#line hidden - WriteLiteral(" "); -#line 235 "LogPage.cshtml" - Write(kvp.Key); - -#line default -#line hidden - WriteLiteral("
\r\n
- - -"); - } - #pragma warning restore 1998 - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cshtml deleted file mode 100644 index b8e356df46..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.cshtml +++ /dev/null @@ -1,263 +0,0 @@ -@using System -@using System.Collections.Generic -@using System.Globalization -@using System.Linq -@using Microsoft.AspNetCore.Diagnostics.Elm -@using Microsoft.AspNetCore.Diagnostics.Elm.Views -@using Microsoft.AspNetCore.DiagnosticsViewPage.Views -@using Microsoft.Extensions.Logging - -@functions -{ - public LogPage(LogPageModel model) - { - Model = model; - } - - public LogPageModel Model { get; set; } - - public HelperResult LogRow(LogInfo log, int level) - { - return new HelperResult((writer) => - { - if (log.Severity >= Model.Options.MinLevel && - (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) - { - - WriteLiteralTo(writer, " \r\n "); - WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time)); - - WriteLiteralTo(writer, "\r\n "); - WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time)); - - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Name); - var severity = log.Severity.ToString().ToLowerInvariant(); - WriteLiteralTo(writer, $"\r\n "); - WriteTo(writer, log.Severity); - - WriteLiteralTo(writer, $"\r\n \r\n"); - - for (var i = 0; i < level; i++) - { - WriteLiteralTo(writer, " \r\n"); - } - - WriteLiteralTo(writer, " "); - WriteTo(writer, log.Message); - - WriteLiteralTo(writer, $"\r\n \r\n "); - - WriteTo(writer, log.Exception); - - WriteLiteralTo(writer, "\r\n \r\n"); - - } - }); - } - - public HelperResult Traverse(ScopeNode node, int level, Dictionary counts) - { - return new HelperResult((writer) => { - // print start of scope - WriteTo(writer, LogRow(new LogInfo() - { - Name = node.Name, - Time = node.StartTime, - Severity = LogLevel.Debug, - Message = "Beginning " + node.State, - }, level)); - - var messageIndex = 0; - var childIndex = 0; - while (messageIndex < node.Messages.Count && childIndex < node.Children.Count) - { - if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) - { - WriteTo(writer, LogRow(node.Messages[messageIndex], level)); - - counts[node.Messages[messageIndex].Severity.ToString()]++; - messageIndex++; - } - else - { - WriteTo(writer, Traverse(node.Children[childIndex], level + 1, counts)); - childIndex++; - } - } - if (messageIndex < node.Messages.Count) - { - for (var i = messageIndex; i < node.Messages.Count; i++) - { - WriteTo(writer, LogRow(node.Messages[i], level)); - counts[node.Messages[i].Severity.ToString()]++; - } - } - else - { - for (var i = childIndex; i < node.Children.Count; i++) - { - WriteTo(writer, Traverse(node.Children[i], level + 1, counts)); - } - } - // print end of scope - WriteTo(writer, LogRow(new LogInfo() - { - Name = node.Name, - Time = node.EndTime, - Severity = LogLevel.Debug, - Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime) - }, level)); - }); - } -} -@{ - Response.ContentType = "text/html"; -} - - - - - - ASP.NET Core Logs - - - - -

ASP.NET Core Logs

-
- - - -
-
- -
- - - - - - - - - - - - - - - - - - - @foreach (var activity in Model.Activities.Reverse()) - { - - - @{ - var activityPath = Model.Path.Value + "/" + activity.Id; - if (activity.HttpInfo != null) - { - - - - - } - else if (activity.RepresentsScope) - { - - } - else - { - - } - } - - - - } -
PathMethodHostStatus CodeLogs
@activity.HttpInfo.Path@activity.HttpInfo.Method@activity.HttpInfo.Host@activity.HttpInfo.StatusCode@activity.Root.StateNon-scope Log - - - - - - - - - - - - @{ - var counts = new Dictionary(); - counts["Critical"] = 0; - counts["Error"] = 0; - counts["Warning"] = 0; - counts["Information"] = 0; - counts["Debug"] = 0; - } - - @if (!activity.RepresentsScope) - { - // message not within a scope - var logInfo = activity.Root.Messages.FirstOrDefault(); - @LogRow(logInfo, 0) - counts[logInfo.Severity.ToString()] = 1; - } - else - { - @Traverse(activity.Root, 0, counts) - } - - - - - @foreach (var kvp in counts) - { - if (string.Equals("Debug", kvp.Key)) { - - } - else - { - - } - } - - -
DateTimeNameSeverityStateError^
@activity.Time.ToString("MM-dd-yyyy HH:mm:ss")@kvp.Value @kvp.Keyv@kvp.Value @kvp.Key
-
- - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.css deleted file mode 100644 index 420cc18121..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPage.css +++ /dev/null @@ -1,110 +0,0 @@ -body { - font-size: .813em; - white-space: nowrap; - margin: 20px; -} - -col:nth-child(2n) { - background-color: #FAFAFA; -} - -form { - display: inline-block; -} - -h1 { - margin-left: 25px; -} - -table { - margin: 0px auto; - border-collapse: collapse; - border-spacing: 0px; - table-layout: fixed; - width: 100%; -} - -td, th { - padding: 4px; -} - -thead { - font-size: 1em; - font-family: Arial; -} - -tr { - height: 23px; -} - -#requestHeader { - border-bottom: solid 1px gray; - border-top: solid 1px gray; - margin-bottom: 2px; - font-size: 1em; - line-height: 2em; -} - -.collapse { - color: black; - float: right; - font-weight: normal; - width: 1em; -} - -.date, .time { - width: 70px; -} - -.logHeader { - border-bottom: 1px solid lightgray; - color: gray; - text-align: left; -} - -.logState { - text-overflow: ellipsis; - overflow: hidden; -} - -.logTd { - border-left: 1px solid gray; - padding: 0px; -} - -.logs { - width: 80%; -} - -.logRow:hover { - background-color: #D6F5FF; -} - -.requestRow>td { - border-bottom: solid 1px gray; -} - -.severity { - width: 80px; -} - -.summary { - color: black; - line-height: 1.8em; -} - -.summary>th { - font-weight: normal; -} - -.tab { - margin-left: 30px; -} - -#viewOptions { - margin: 20px; -} - -#viewOptions > * { - margin: 5px; -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPageModel.cs deleted file mode 100644 index 8041b21233..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/LogPageModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.AspNetCore.Http; - -namespace Microsoft.AspNetCore.Diagnostics.Elm.Views -{ - [Obsolete("This type is for internal use only and will be removed in a future version.")] - public class LogPageModel - { - public IEnumerable Activities { get; set; } - - public ViewOptions Options { get; set; } - - public PathString Path { get; set; } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/Shared.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/Shared.css deleted file mode 100644 index 18c14c10d1..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Obsolete/Shared.css +++ /dev/null @@ -1,39 +0,0 @@ -body { - font-family: 'Segoe UI', Tahoma, Arial, Helvtica, sans-serif; - line-height: 1.4em; -} - -h1 { - font-family: 'Segoe UI', Helvetica, sans-serif; - font-size: 2.5em; -} - -td { - text-overflow: ellipsis; - overflow: hidden; -} - -tr:nth-child(2n) { - background-color: #F6F6F6; -} - -.critical { - background-color: red; - color: white; -} - -.error { - color: red; -} - -.information { - color: blue; -} - -.debug { - color: black; -} - -.warning { - color: orange; -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Shared.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Shared.css deleted file mode 100644 index 18c14c10d1..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Shared.css +++ /dev/null @@ -1,39 +0,0 @@ -body { - font-family: 'Segoe UI', Tahoma, Arial, Helvtica, sans-serif; - line-height: 1.4em; -} - -h1 { - font-family: 'Segoe UI', Helvetica, sans-serif; - font-size: 2.5em; -} - -td { - text-overflow: ellipsis; - overflow: hidden; -} - -tr:nth-child(2n) { - background-color: #F6F6F6; -} - -.critical { - background-color: red; - color: white; -} - -.error { - color: red; -} - -.information { - color: blue; -} - -.debug { - color: black; -} - -.warning { - color: orange; -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/baseline.netcore.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/baseline.netcore.json deleted file mode 100644 index 40dd1cfb96..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/baseline.netcore.json +++ /dev/null @@ -1,2347 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.AspNetCore.Diagnostics.Elm, Version=0.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.AttributeValue", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Prefix", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Value", - "Parameters": [], - "ReturnType": "System.Object", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Literal", - "Parameters": [], - "ReturnType": "System.Boolean", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "FromTuple", - "Parameters": [ - { - "Name": "value", - "Type": "System.Tuple" - } - ], - "ReturnType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.AttributeValue", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "FromTuple", - "Parameters": [ - { - "Name": "value", - "Type": "System.Tuple" - } - ], - "ReturnType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.AttributeValue", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "op_Implicit", - "Parameters": [ - { - "Name": "value", - "Type": "System.Tuple" - } - ], - "ReturnType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.AttributeValue", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "prefix", - "Type": "System.String" - }, - { - "Name": "value", - "Type": "System.Object" - }, - { - "Name": "literal", - "Type": "System.Boolean" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Context", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.HttpContext", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Request", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.HttpRequest", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Response", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.HttpResponse", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Output", - "Parameters": [], - "ReturnType": "System.IO.StreamWriter", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_HtmlEncoder", - "Parameters": [], - "ReturnType": "System.Text.Encodings.Web.HtmlEncoder", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_HtmlEncoder", - "Parameters": [ - { - "Name": "value", - "Type": "System.Text.Encodings.Web.HtmlEncoder" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_UrlEncoder", - "Parameters": [], - "ReturnType": "System.Text.Encodings.Web.UrlEncoder", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_UrlEncoder", - "Parameters": [ - { - "Name": "value", - "Type": "System.Text.Encodings.Web.UrlEncoder" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_JavaScriptEncoder", - "Parameters": [], - "ReturnType": "System.Text.Encodings.Web.JavaScriptEncoder", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_JavaScriptEncoder", - "Parameters": [ - { - "Name": "value", - "Type": "System.Text.Encodings.Web.JavaScriptEncoder" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "ExecuteAsync", - "Parameters": [ - { - "Name": "context", - "Type": "Microsoft.AspNetCore.Http.HttpContext" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "ExecuteAsync", - "Parameters": [], - "ReturnType": "System.Threading.Tasks.Task", - "Virtual": true, - "Abstract": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteLiteral", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteLiteral", - "Parameters": [ - { - "Name": "value", - "Type": "System.Object" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteAttributeValue", - "Parameters": [ - { - "Name": "thingy", - "Type": "System.String" - }, - { - "Name": "startPostion", - "Type": "System.Int32" - }, - { - "Name": "value", - "Type": "System.Object" - }, - { - "Name": "endValue", - "Type": "System.Int32" - }, - { - "Name": "dealyo", - "Type": "System.Int32" - }, - { - "Name": "yesno", - "Type": "System.Boolean" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "BeginWriteAttribute", - "Parameters": [ - { - "Name": "name", - "Type": "System.String" - }, - { - "Name": "begining", - "Type": "System.String" - }, - { - "Name": "startPosition", - "Type": "System.Int32" - }, - { - "Name": "ending", - "Type": "System.String" - }, - { - "Name": "endPosition", - "Type": "System.Int32" - }, - { - "Name": "thingy", - "Type": "System.Int32" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "EndWriteAttribute", - "Parameters": [], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteAttributeTo", - "Parameters": [ - { - "Name": "writer", - "Type": "System.IO.TextWriter" - }, - { - "Name": "name", - "Type": "System.String" - }, - { - "Name": "leader", - "Type": "System.String" - }, - { - "Name": "trailer", - "Type": "System.String" - }, - { - "Name": "values", - "Type": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.AttributeValue[]", - "IsParams": true - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Write", - "Parameters": [ - { - "Name": "value", - "Type": "System.Object" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Write", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Write", - "Parameters": [ - { - "Name": "result", - "Type": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.HelperResult" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteTo", - "Parameters": [ - { - "Name": "writer", - "Type": "System.IO.TextWriter" - }, - { - "Name": "value", - "Type": "System.Object" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteTo", - "Parameters": [ - { - "Name": "writer", - "Type": "System.IO.TextWriter" - }, - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteLiteralTo", - "Parameters": [ - { - "Name": "writer", - "Type": "System.IO.TextWriter" - }, - { - "Name": "value", - "Type": "System.Object" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteLiteralTo", - "Parameters": [ - { - "Name": "writer", - "Type": "System.IO.TextWriter" - }, - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "HtmlEncodeAndReplaceLineBreaks", - "Parameters": [ - { - "Name": "input", - "Type": "System.String" - } - ], - "ReturnType": "System.String", - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Protected", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.HelperResult", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_WriteAction", - "Parameters": [], - "ReturnType": "System.Action", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "WriteTo", - "Parameters": [ - { - "Name": "writer", - "Type": "System.IO.TextWriter" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "action", - "Type": "System.Action" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Builder.ElmExtensions", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "UseElmCapture", - "Parameters": [ - { - "Name": "app", - "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder" - } - ], - "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "UseElmPage", - "Parameters": [ - { - "Name": "app", - "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder" - } - ], - "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Id", - "Parameters": [], - "ReturnType": "System.Guid", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Id", - "Parameters": [ - { - "Name": "value", - "Type": "System.Guid" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_HttpInfo", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.HttpInfo", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_HttpInfo", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.HttpInfo" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Root", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Root", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Time", - "Parameters": [], - "ReturnType": "System.DateTimeOffset", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Time", - "Parameters": [ - { - "Name": "value", - "Type": "System.DateTimeOffset" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_IsCollapsed", - "Parameters": [], - "ReturnType": "System.Boolean", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_IsCollapsed", - "Parameters": [ - { - "Name": "value", - "Type": "System.Boolean" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_RepresentsScope", - "Parameters": [], - "ReturnType": "System.Boolean", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_RepresentsScope", - "Parameters": [ - { - "Name": "value", - "Type": "System.Boolean" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ElmCaptureMiddleware", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "Invoke", - "Parameters": [ - { - "Name": "context", - "Type": "Microsoft.AspNetCore.Http.HttpContext" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "next", - "Type": "Microsoft.AspNetCore.Http.RequestDelegate" - }, - { - "Name": "factory", - "Type": "Microsoft.Extensions.Logging.ILoggerFactory" - }, - { - "Name": "options", - "Type": "Microsoft.Extensions.Options.IOptions" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ElmLogger", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [ - "Microsoft.Extensions.Logging.ILogger" - ], - "Members": [ - { - "Kind": "Method", - "Name": "Log", - "Parameters": [ - { - "Name": "logLevel", - "Type": "Microsoft.Extensions.Logging.LogLevel" - }, - { - "Name": "eventId", - "Type": "Microsoft.Extensions.Logging.EventId" - }, - { - "Name": "state", - "Type": "T0" - }, - { - "Name": "exception", - "Type": "System.Exception" - }, - { - "Name": "formatter", - "Type": "System.Func" - } - ], - "ReturnType": "System.Void", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Logging.ILogger", - "Visibility": "Public", - "GenericParameter": [ - { - "ParameterName": "TState", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [] - } - ] - }, - { - "Kind": "Method", - "Name": "IsEnabled", - "Parameters": [ - { - "Name": "logLevel", - "Type": "Microsoft.Extensions.Logging.LogLevel" - } - ], - "ReturnType": "System.Boolean", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Logging.ILogger", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "BeginScope", - "Parameters": [ - { - "Name": "state", - "Type": "T0" - } - ], - "ReturnType": "System.IDisposable", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Logging.ILogger", - "Visibility": "Public", - "GenericParameter": [ - { - "ParameterName": "TState", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [] - } - ] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "name", - "Type": "System.String" - }, - { - "Name": "options", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmOptions" - }, - { - "Name": "store", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmStore" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ElmLoggerProvider", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [ - "Microsoft.Extensions.Logging.ILoggerProvider" - ], - "Members": [ - { - "Kind": "Method", - "Name": "Dispose", - "Parameters": [], - "ReturnType": "System.Void", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "System.IDisposable", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "CreateLogger", - "Parameters": [ - { - "Name": "name", - "Type": "System.String" - } - ], - "ReturnType": "Microsoft.Extensions.Logging.ILogger", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Logging.ILoggerProvider", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "store", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmStore" - }, - { - "Name": "options", - "Type": "Microsoft.Extensions.Options.IOptions" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ElmOptions", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Path", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.PathString", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Path", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.PathString" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Filter", - "Parameters": [], - "ReturnType": "System.Func", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Filter", - "Parameters": [ - { - "Name": "value", - "Type": "System.Func" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ElmPageMiddleware", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "Invoke", - "Parameters": [ - { - "Name": "context", - "Type": "Microsoft.AspNetCore.Http.HttpContext" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "next", - "Type": "Microsoft.AspNetCore.Http.RequestDelegate" - }, - { - "Name": "options", - "Type": "Microsoft.Extensions.Options.IOptions" - }, - { - "Name": "store", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmStore" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ElmScope", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Context", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Context", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Parent", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ElmScope", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Parent", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmScope" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Node", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Node", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Current", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmScope" - } - ], - "ReturnType": "System.Void", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Current", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ElmScope", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Push", - "Parameters": [ - { - "Name": "scope", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmScope" - }, - { - "Name": "store", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ElmStore" - } - ], - "ReturnType": "System.IDisposable", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "name", - "Type": "System.String" - }, - { - "Name": "state", - "Type": "System.Object" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ElmStore", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "GetActivities", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IEnumerable", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "AddActivity", - "Parameters": [ - { - "Name": "activity", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Clear", - "Parameters": [], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Count", - "Parameters": [], - "ReturnType": "System.Int32", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.HttpInfo", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_RequestID", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_RequestID", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Host", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.HostString", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Host", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.HostString" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Path", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.PathString", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Path", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.PathString" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_ContentType", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_ContentType", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Scheme", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Scheme", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_StatusCode", - "Parameters": [], - "ReturnType": "System.Int32", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_StatusCode", - "Parameters": [ - { - "Name": "value", - "Type": "System.Int32" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_User", - "Parameters": [], - "ReturnType": "System.Security.Claims.ClaimsPrincipal", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_User", - "Parameters": [ - { - "Name": "value", - "Type": "System.Security.Claims.ClaimsPrincipal" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Method", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Method", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Protocol", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Protocol", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Headers", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.IHeaderDictionary", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Headers", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.IHeaderDictionary" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Query", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.QueryString", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Query", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.QueryString" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Cookies", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.IRequestCookieCollection", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Cookies", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.IRequestCookieCollection" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.LogInfo", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_ActivityContext", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_ActivityContext", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Name", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Name", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_State", - "Parameters": [], - "ReturnType": "System.Object", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_State", - "Parameters": [ - { - "Name": "value", - "Type": "System.Object" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Exception", - "Parameters": [], - "ReturnType": "System.Exception", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Exception", - "Parameters": [ - { - "Name": "value", - "Type": "System.Exception" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Message", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Message", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Severity", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.Logging.LogLevel", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Severity", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.Extensions.Logging.LogLevel" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_EventID", - "Parameters": [], - "ReturnType": "System.Int32", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_EventID", - "Parameters": [ - { - "Name": "value", - "Type": "System.Int32" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Time", - "Parameters": [], - "ReturnType": "System.DateTimeOffset", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Time", - "Parameters": [ - { - "Name": "value", - "Type": "System.DateTimeOffset" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Parent", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Parent", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Children", - "Parameters": [], - "ReturnType": "System.Collections.Generic.List", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Messages", - "Parameters": [], - "ReturnType": "System.Collections.Generic.List", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_StartTime", - "Parameters": [], - "ReturnType": "System.DateTimeOffset", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_StartTime", - "Parameters": [ - { - "Name": "value", - "Type": "System.DateTimeOffset" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_EndTime", - "Parameters": [], - "ReturnType": "System.DateTimeOffset", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_EndTime", - "Parameters": [ - { - "Name": "value", - "Type": "System.DateTimeOffset" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_State", - "Parameters": [], - "ReturnType": "System.Object", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_State", - "Parameters": [ - { - "Name": "value", - "Type": "System.Object" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Name", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Name", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_MinLevel", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.Logging.LogLevel", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_MinLevel", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.Extensions.Logging.LogLevel" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_NamePrefix", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_NamePrefix", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.Views.DetailsPage", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Model", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.Views.DetailsPageModel", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Model", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.Views.DetailsPageModel" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "LogRow", - "Parameters": [ - { - "Name": "log", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.LogInfo" - } - ], - "ReturnType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.HelperResult", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Traverse", - "Parameters": [ - { - "Name": "node", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode" - } - ], - "ReturnType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.HelperResult", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "ExecuteAsync", - "Parameters": [], - "ReturnType": "System.Threading.Tasks.Task", - "Virtual": true, - "Override": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "model", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.Views.DetailsPageModel" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.Views.DetailsPageModel", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Activity", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Activity", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Options", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Options", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.Views.LogPage", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.BaseView", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Model", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.Views.LogPageModel", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Model", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.Views.LogPageModel" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "LogRow", - "Parameters": [ - { - "Name": "log", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.LogInfo" - }, - { - "Name": "level", - "Type": "System.Int32" - } - ], - "ReturnType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.HelperResult", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Traverse", - "Parameters": [ - { - "Name": "node", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ScopeNode" - }, - { - "Name": "level", - "Type": "System.Int32" - }, - { - "Name": "counts", - "Type": "System.Collections.Generic.Dictionary" - } - ], - "ReturnType": "Microsoft.AspNetCore.DiagnosticsViewPage.Views.HelperResult", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "ExecuteAsync", - "Parameters": [], - "ReturnType": "System.Threading.Tasks.Task", - "Virtual": true, - "Override": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "model", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.Views.LogPageModel" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.Views.LogPageModel", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Activities", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IEnumerable", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Activities", - "Parameters": [ - { - "Name": "value", - "Type": "System.Collections.Generic.IEnumerable" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Options", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Options", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Path", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.PathString", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Path", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.PathString" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.RazorViews.DetailsPageModel", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Activity", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Activity", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ActivityContext" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Options", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Options", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.Elm.RazorViews.LogPageModel", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Activities", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IEnumerable", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Activities", - "Parameters": [ - { - "Name": "value", - "Type": "System.Collections.Generic.IEnumerable" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Options", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Options", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Diagnostics.Elm.ViewOptions" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Path", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.PathString", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Path", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.PathString" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.DependencyInjection.ElmServiceCollectionExtensions", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "AddElm", - "Parameters": [ - { - "Name": "services", - "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection" - } - ], - "ReturnType": "Microsoft.Extensions.DependencyInjection.IServiceCollection", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "AddElm", - "Parameters": [ - { - "Name": "services", - "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection" - }, - { - "Name": "setupAction", - "Type": "System.Action" - } - ], - "ReturnType": "Microsoft.Extensions.DependencyInjection.IServiceCollection", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckAppBuilderExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckAppBuilderExtensions.cs deleted file mode 100644 index 916ca46df4..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckAppBuilderExtensions.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Diagnostics.HealthChecks; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Options; - -namespace Microsoft.AspNetCore.Builder -{ - /// - /// extension methods for the . - /// - public static class HealthCheckAppBuilderExtensions - { - /// - /// Adds a middleware that provides a REST API for requesting health check status. - /// - /// The . - /// The path on which to provide the API. - /// A reference to the after the operation has completed. - public static IApplicationBuilder UseHealthChecks(this IApplicationBuilder app, PathString path) - { - app = app ?? throw new ArgumentNullException(nameof(app)); - - return app.UseMiddleware(Options.Create(new HealthCheckOptions() - { - Path = path - })); - } - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckMiddleware.cs deleted file mode 100644 index 18c10da287..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckMiddleware.cs +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Diagnostics.HealthChecks; -using Microsoft.Extensions.Options; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace Microsoft.AspNetCore.Diagnostics.HealthChecks -{ - public class HealthCheckMiddleware - { - private readonly RequestDelegate _next; - private readonly HealthCheckOptions _healthCheckOptions; - private readonly IHealthCheckService _healthCheckService; - - public HealthCheckMiddleware(RequestDelegate next, IOptions healthCheckOptions, IHealthCheckService healthCheckService) - { - _next = next; - _healthCheckOptions = healthCheckOptions.Value; - _healthCheckService = healthCheckService; - } - - /// - /// Process an individual request. - /// - /// - /// - public async Task InvokeAsync(HttpContext context) - { - if (context.Request.Path == _healthCheckOptions.Path) - { - // Get results - var result = await _healthCheckService.CheckHealthAsync(context.RequestAborted); - - // Map status to response code - switch (result.Status) - { - case HealthCheckStatus.Failed: - context.Response.StatusCode = StatusCodes.Status500InternalServerError; - break; - case HealthCheckStatus.Unhealthy: - context.Response.StatusCode = StatusCodes.Status503ServiceUnavailable; - break; - case HealthCheckStatus.Degraded: - // Degraded doesn't mean unhealthy so we return 200, but the content will contain more details - context.Response.StatusCode = StatusCodes.Status200OK; - break; - case HealthCheckStatus.Healthy: - context.Response.StatusCode = StatusCodes.Status200OK; - break; - default: - // This will only happen when we change HealthCheckStatus and we don't update this. - Debug.Fail($"Unrecognized HealthCheckStatus value: {result.Status}"); - throw new InvalidOperationException($"Unrecognized HealthCheckStatus value: {result.Status}"); - } - - // Render results to JSON - var json = new JObject( - new JProperty("status", result.Status.ToString()), - new JProperty("results", new JObject(result.Results.Select(pair => - new JProperty(pair.Key, new JObject( - new JProperty("status", pair.Value.Status.ToString()), - new JProperty("description", pair.Value.Description), - new JProperty("data", new JObject(pair.Value.Data.Select(p => new JProperty(p.Key, p.Value)))))))))); - await context.Response.WriteAsync(json.ToString(Formatting.None)); - } - else - { - await _next(context); - } - } - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckOptions.cs deleted file mode 100644 index 8416e6843d..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/HealthCheckOptions.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Http; - -namespace Microsoft.AspNetCore.Diagnostics.HealthChecks -{ - /// - /// Contains options for the . - /// - public class HealthCheckOptions - { - /// - /// Gets or sets the path at which the Health Check results will be available. - /// - public PathString Path { get; set; } - } -} diff --git a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj b/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj deleted file mode 100644 index 76a24a4c47..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - ASP.NET Core middleware for returning the results of Health Checks in the application - netstandard2.0 - $(NoWarn);CS1591 - true - diagnostics;healthchecks - ASP.NET Core middleware for returning the results of Health Checks in the application - - - netstandard2.0 - $(NoWarn);CS1591 - true - diagnostics;healthchecks - - - - - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/baseline.netcore.json b/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/baseline.netcore.json deleted file mode 100644 index c0e8deddd1..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/baseline.netcore.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.AspNetCore.Diagnostics.HealthChecks, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.AspNetCore.Diagnostics.HealthChecks.HealthCheckMiddleware", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "InvokeAsync", - "Parameters": [ - { - "Name": "context", - "Type": "Microsoft.AspNetCore.Http.HttpContext" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "next", - "Type": "Microsoft.AspNetCore.Http.RequestDelegate" - }, - { - "Name": "healthCheckOptions", - "Type": "Microsoft.Extensions.Options.IOptions" - }, - { - "Name": "healthCheckService", - "Type": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheckService" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Diagnostics.HealthChecks.HealthCheckOptions", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Path", - "Parameters": [], - "ReturnType": "Microsoft.AspNetCore.Http.PathString", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Path", - "Parameters": [ - { - "Name": "value", - "Type": "Microsoft.AspNetCore.Http.PathString" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.Builder.HealthCheckAppBuilderExtensions", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "UseHealthChecks", - "Parameters": [ - { - "Name": "app", - "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder" - }, - { - "Name": "path", - "Type": "Microsoft.AspNetCore.Http.PathString" - } - ], - "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj deleted file mode 100644 index b91c2a01d0..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;diagnostics - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckResult.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckResult.cs deleted file mode 100644 index e672c88db5..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckResult.cs +++ /dev/null @@ -1,188 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// Represents the result of a health check. - /// - public struct HealthCheckResult - { - private static readonly IReadOnlyDictionary _emptyReadOnlyDictionary = new Dictionary(); - - private string _description; - private IReadOnlyDictionary _data; - - /// - /// Gets a value indicating the status of the component that was checked. - /// - public HealthCheckStatus Status { get; } - - /// - /// Gets an representing the exception that was thrown when checking for status (if any). - /// - /// - /// This value is expected to be 'null' if is . - /// - public Exception Exception { get; } - - /// - /// Gets a human-readable description of the status of the component that was checked. - /// - public string Description => _description ?? string.Empty; - - /// - /// Gets additional key-value pairs describing the health of the component. - /// - public IReadOnlyDictionary Data => _data ?? _emptyReadOnlyDictionary; - - /// - /// Creates a new with the specified , , - /// , and . - /// - /// A value indicating the status of the component that was checked. - /// An representing the exception that was thrown when checking for status (if any). - /// A human-readable description of the status of the component that was checked. - /// Additional key-value pairs describing the health of the component. - public HealthCheckResult(HealthCheckStatus status, Exception exception, string description, IReadOnlyDictionary data) - { - if (status == HealthCheckStatus.Unknown) - { - throw new ArgumentException($"'{nameof(HealthCheckStatus.Unknown)}' is not a valid value for the 'status' parameter.", nameof(status)); - } - - Status = status; - Exception = exception; - _description = description; - _data = data; - } - - /// - /// Creates a representing an unhealthy component. - /// - /// A representing an unhealthy component. - public static HealthCheckResult Unhealthy() - => new HealthCheckResult(HealthCheckStatus.Unhealthy, exception: null, description: string.Empty, data: null); - - /// - /// Creates a representing an unhealthy component. - /// - /// A representing an unhealthy component. - /// A human-readable description of the status of the component that was checked. - public static HealthCheckResult Unhealthy(string description) - => new HealthCheckResult(HealthCheckStatus.Unhealthy, exception: null, description: description, data: null); - - /// - /// Creates a representing an unhealthy component. - /// - /// A representing an unhealthy component. - /// A human-readable description of the status of the component that was checked. - /// Additional key-value pairs describing the health of the component. - public static HealthCheckResult Unhealthy(string description, IReadOnlyDictionary data) - => new HealthCheckResult(HealthCheckStatus.Unhealthy, exception: null, description: description, data: data); - - /// - /// Creates a representing an unhealthy component. - /// - /// A representing an unhealthy component. - /// An representing the exception that was thrown when checking for status (if any). - public static HealthCheckResult Unhealthy(Exception exception) - => new HealthCheckResult(HealthCheckStatus.Unhealthy, exception, description: string.Empty, data: null); - - /// - /// Creates a representing an unhealthy component. - /// - /// A representing an unhealthy component. - /// A human-readable description of the status of the component that was checked. - /// An representing the exception that was thrown when checking for status (if any). - public static HealthCheckResult Unhealthy(string description, Exception exception) - => new HealthCheckResult(HealthCheckStatus.Unhealthy, exception, description, data: null); - - /// - /// Creates a representing an unhealthy component. - /// - /// A representing an unhealthy component. - /// A human-readable description of the status of the component that was checked. - /// An representing the exception that was thrown when checking for status (if any). - /// Additional key-value pairs describing the health of the component. - public static HealthCheckResult Unhealthy(string description, Exception exception, IReadOnlyDictionary data) - => new HealthCheckResult(HealthCheckStatus.Unhealthy, exception, description, data); - - /// - /// Creates a representing a healthy component. - /// - /// A representing a healthy component. - public static HealthCheckResult Healthy() - => new HealthCheckResult(HealthCheckStatus.Healthy, exception: null, description: string.Empty, data: null); - - /// - /// Creates a representing a healthy component. - /// - /// A representing a healthy component. - /// A human-readable description of the status of the component that was checked. - public static HealthCheckResult Healthy(string description) - => new HealthCheckResult(HealthCheckStatus.Healthy, exception: null, description: description, data: null); - - /// - /// Creates a representing a healthy component. - /// - /// A representing a healthy component. - /// A human-readable description of the status of the component that was checked. - /// Additional key-value pairs describing the health of the component. - public static HealthCheckResult Healthy(string description, IReadOnlyDictionary data) - => new HealthCheckResult(HealthCheckStatus.Healthy, exception: null, description: description, data: data); - - /// - /// Creates a representing a component in a degraded state. - /// - /// A representing a component in a degraded state. - public static HealthCheckResult Degraded() - => new HealthCheckResult(HealthCheckStatus.Degraded, exception: null, description: string.Empty, data: null); - - /// - /// Creates a representing a component in a degraded state. - /// - /// A representing a component in a degraded state. - /// A human-readable description of the status of the component that was checked. - public static HealthCheckResult Degraded(string description) - => new HealthCheckResult(HealthCheckStatus.Degraded, exception: null, description: description, data: null); - - /// - /// Creates a representing a component in a degraded state. - /// - /// A representing a component in a degraded state. - /// A human-readable description of the status of the component that was checked. - /// Additional key-value pairs describing the health of the component. - public static HealthCheckResult Degraded(string description, IReadOnlyDictionary data) - => new HealthCheckResult(HealthCheckStatus.Degraded, exception: null, description: description, data: data); - - /// - /// Creates a representing a component in a degraded state. - /// - /// A representing a component in a degraded state. - public static HealthCheckResult Degraded(Exception exception) - => new HealthCheckResult(HealthCheckStatus.Degraded, exception: null, description: string.Empty, data: null); - - /// - /// Creates a representing a component in a degraded state. - /// - /// A representing a component in a degraded state. - /// A human-readable description of the status of the component that was checked. - /// An representing the exception that was thrown when checking for status (if any). - public static HealthCheckResult Degraded(string description, Exception exception) - => new HealthCheckResult(HealthCheckStatus.Degraded, exception, description, data: null); - - /// - /// Creates a representing a component in a degraded state. - /// - /// A representing a component in a degraded state. - /// A human-readable description of the status of the component that was checked. - /// An representing the exception that was thrown when checking for status (if any). - /// Additional key-value pairs describing the health of the component. - public static HealthCheckResult Degraded(string description, Exception exception, IReadOnlyDictionary data) - => new HealthCheckResult(HealthCheckStatus.Degraded, exception, description, data); - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckStatus.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckStatus.cs deleted file mode 100644 index c16739eadc..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/HealthCheckStatus.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// Represents the status of a health check result. - /// - /// - /// The values of this enum or ordered from least healthy to most healthy. So is - /// greater than but less than . - /// - public enum HealthCheckStatus - { - /// - /// This value should not be returned by a health check. It is used to represent an uninitialized value. - /// - Unknown = 0, - - /// - /// This value should not be returned by a health check. It is used to indicate that an unexpected exception was - /// thrown when running the health check. - /// - Failed = 1, - - /// - /// Indicates that the health check determined that the component was unhealthy. - /// - Unhealthy = 2, - - /// - /// Indicates that the health check determined that the component was in a degraded state. - /// - Degraded = 3, - - /// - /// Indicates that the health check determined that the component was healthy. - /// - Healthy = 4, - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/IHealthCheck.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/IHealthCheck.cs deleted file mode 100644 index 2bf751180d..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/IHealthCheck.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// Represents a health check, which can be used to check the status of a component in the application, such as a backend service, database or some internal - /// state. - /// - public interface IHealthCheck - { - /// - /// Gets the name of the health check, which should indicate the component being checked. - /// - string Name { get; } - - /// - /// Runs the health check, returning the status of the component being checked. - /// - /// A that can be used to cancel the health check. - /// A that completes when the health check has finished, yielding the status of the component being checked. - Task CheckHealthAsync(CancellationToken cancellationToken = default); - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj b/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj deleted file mode 100644 index bcbc46c8ca..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - Abstractions for defining health checks in .NET applications - -Commonly Used Types -Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck - - Microsoft.Extensions.Diagnostics.HealthChecks - netstandard2.0 - $(NoWarn);CS1591 - true - diagnostics;healthchecks - - - diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/baseline.netcore.json b/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/baseline.netcore.json deleted file mode 100644 index 7792748d55..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/baseline.netcore.json +++ /dev/null @@ -1,377 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Visibility": "Public", - "Kind": "Struct", - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Status", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckStatus", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Exception", - "Parameters": [], - "ReturnType": "System.Exception", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Description", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Data", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IReadOnlyDictionary", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Unhealthy", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Unhealthy", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Unhealthy", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "data", - "Type": "System.Collections.Generic.IReadOnlyDictionary" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Unhealthy", - "Parameters": [ - { - "Name": "exception", - "Type": "System.Exception" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Unhealthy", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "exception", - "Type": "System.Exception" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Unhealthy", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "exception", - "Type": "System.Exception" - }, - { - "Name": "data", - "Type": "System.Collections.Generic.IReadOnlyDictionary" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Healthy", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Healthy", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Healthy", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "data", - "Type": "System.Collections.Generic.IReadOnlyDictionary" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Degraded", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Degraded", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Degraded", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "data", - "Type": "System.Collections.Generic.IReadOnlyDictionary" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Degraded", - "Parameters": [ - { - "Name": "exception", - "Type": "System.Exception" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Degraded", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "exception", - "Type": "System.Exception" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "Degraded", - "Parameters": [ - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "exception", - "Type": "System.Exception" - }, - { - "Name": "data", - "Type": "System.Collections.Generic.IReadOnlyDictionary" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "status", - "Type": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckStatus" - }, - { - "Name": "exception", - "Type": "System.Exception" - }, - { - "Name": "description", - "Type": "System.String" - }, - { - "Name": "data", - "Type": "System.Collections.Generic.IReadOnlyDictionary" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckStatus", - "Visibility": "Public", - "Kind": "Enumeration", - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Field", - "Name": "Unknown", - "Parameters": [], - "GenericParameter": [], - "Literal": "0" - }, - { - "Kind": "Field", - "Name": "Failed", - "Parameters": [], - "GenericParameter": [], - "Literal": "1" - }, - { - "Kind": "Field", - "Name": "Unhealthy", - "Parameters": [], - "GenericParameter": [], - "Literal": "2" - }, - { - "Kind": "Field", - "Name": "Degraded", - "Parameters": [], - "GenericParameter": [], - "Literal": "3" - }, - { - "Kind": "Field", - "Name": "Healthy", - "Parameters": [], - "GenericParameter": [], - "Literal": "4" - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck", - "Visibility": "Public", - "Kind": "Interface", - "Abstract": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Name", - "Parameters": [], - "ReturnType": "System.String", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "CheckHealthAsync", - "Parameters": [ - { - "Name": "cancellationToken", - "Type": "System.Threading.CancellationToken", - "DefaultValue": "default(System.Threading.CancellationToken)" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/CompositeHealthCheckResult.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/CompositeHealthCheckResult.cs deleted file mode 100644 index 900b15bd71..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/CompositeHealthCheckResult.cs +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// Represents the results of multiple health checks. - /// - public class CompositeHealthCheckResult - { - /// - /// A containing the results from each health check. - /// - /// - /// The keys in this dictionary map to the name of the health check, the values are the - /// returned when was called for that health check. - /// - public IReadOnlyDictionary Results { get; } - - /// - /// Gets a representing the aggregate status of all the health checks. - /// - /// - /// This value is determined by taking the "worst" result of all the results. So if any result is , - /// this value is . If no result is but any result is - /// , this value is , etc. - /// - public HealthCheckStatus Status { get; } - - /// - /// Create a new from the specified results. - /// - /// A containing the results from each health check. - public CompositeHealthCheckResult(IReadOnlyDictionary results) - { - Results = results; - Status = CalculateAggregateStatus(results.Values); - } - - private HealthCheckStatus CalculateAggregateStatus(IEnumerable results) - { - // This is basically a Min() check, but we know the possible range, so we don't need to walk the whole list - var currentValue = HealthCheckStatus.Healthy; - foreach (var result in results) - { - if (currentValue > result.Status) - { - currentValue = result.Status; - } - - if (currentValue == HealthCheckStatus.Failed) - { - // Game over, man! Game over! - // (We hit the worst possible status, so there's no need to keep iterating) - return currentValue; - } - } - - return currentValue; - } - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheck.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheck.cs deleted file mode 100644 index e72910df33..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheck.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// A simple implementation of which uses a provided delegate to - /// implement the check. - /// - public class HealthCheck : IHealthCheck - { - private readonly Func> _check; - - /// - /// Gets the name of the health check, which should indicate the component being checked. - /// - public string Name { get; } - - /// - /// Create an instance of from the specified and . - /// - /// The name of the health check, which should indicate the component being checked. - /// A delegate which provides the code to execute when the health check is run. - public HealthCheck(string name, Func> check) - { - Name = name; - _check = check; - } - - /// - /// Runs the health check, returning the status of the component being checked. - /// - /// A that can be used to cancel the health check. - /// A that completes when the health check has finished, yielding the status of the component being checked. - public Task CheckHealthAsync(CancellationToken cancellationToken = default) => _check(cancellationToken); - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckLogScope.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckLogScope.cs deleted file mode 100644 index c7ef3ff5bd..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckLogScope.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - internal class HealthCheckLogScope : IReadOnlyList> - { - public string HealthCheckName { get; } - - int IReadOnlyCollection>.Count { get; } = 1; - - KeyValuePair IReadOnlyList>.this[int index] - { - get - { - if (index == 0) - { - return new KeyValuePair(nameof(HealthCheckName), HealthCheckName); - } - - throw new ArgumentOutOfRangeException(nameof(index)); - } - } - - /// - /// Creates a new instance of with the provided name. - /// - /// The name of the health check being executed. - public HealthCheckLogScope(string healthCheckName) - { - HealthCheckName = healthCheckName; - } - - IEnumerator> IEnumerable>.GetEnumerator() - { - yield return new KeyValuePair(nameof(HealthCheckName), HealthCheckName); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return ((IEnumerable>)this).GetEnumerator(); - } - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckService.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckService.cs deleted file mode 100644 index 35cc0a1c82..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckService.cs +++ /dev/null @@ -1,132 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// Default implementation of . - /// - public class HealthCheckService : IHealthCheckService - { - private readonly ILogger _logger; - - /// - /// A containing all the health checks registered in the application. - /// - /// - /// The key maps to the property of the health check, and the value is the - /// instance itself. - /// - public IReadOnlyDictionary Checks { get; } - - /// - /// Constructs a from the provided collection of instances. - /// - /// The instances that have been registered in the application. - public HealthCheckService(IEnumerable healthChecks) : this(healthChecks, NullLogger.Instance) { } - - /// - /// Constructs a from the provided collection of instances, and the provided logger. - /// - /// The instances that have been registered in the application. - /// A that can be used to log events that occur during health check operations. - public HealthCheckService(IEnumerable healthChecks, ILogger logger) - { - healthChecks = healthChecks ?? throw new ArgumentNullException(nameof(healthChecks)); - _logger = logger ?? throw new ArgumentNullException(nameof(logger)); - - // Scan the list for duplicate names to provide a better error if there are duplicates. - var names = new HashSet(StringComparer.OrdinalIgnoreCase); - var duplicates = new List(); - foreach (var check in healthChecks) - { - if (!names.Add(check.Name)) - { - duplicates.Add(check.Name); - } - } - - if (duplicates.Count > 0) - { - throw new ArgumentException($"Duplicate health checks were registered with the name(s): {string.Join(", ", duplicates)}", nameof(healthChecks)); - } - - Checks = healthChecks.ToDictionary(c => c.Name, StringComparer.OrdinalIgnoreCase); - - if (_logger.IsEnabled(LogLevel.Debug)) - { - foreach (var check in Checks) - { - _logger.LogDebug("Health check '{healthCheckName}' has been registered", check.Key); - } - } - } - - /// - /// Runs all the health checks in the application and returns the aggregated status. - /// - /// A which can be used to cancel the health checks. - /// - /// A which will complete when all the health checks have been run, - /// yielding a containing the results. - /// - public Task CheckHealthAsync(CancellationToken cancellationToken = default) => - CheckHealthAsync(Checks.Values, cancellationToken); - - /// - /// Runs the provided health checks and returns the aggregated status - /// - /// The instances to be run. - /// A which can be used to cancel the health checks. - /// - /// A which will complete when all the health checks have been run, - /// yielding a containing the results. - /// - public async Task CheckHealthAsync(IEnumerable checks, CancellationToken cancellationToken = default) - { - var results = new Dictionary(Checks.Count, StringComparer.OrdinalIgnoreCase); - foreach (var check in checks) - { - cancellationToken.ThrowIfCancellationRequested(); - // If the health check does things like make Database queries using EF or backend HTTP calls, - // it may be valuable to know that logs it generates are part of a health check. So we start a scope. - using (_logger.BeginScope(new HealthCheckLogScope(check.Name))) - { - HealthCheckResult result; - try - { - _logger.LogTrace("Running health check: {healthCheckName}", check.Name); - result = await check.CheckHealthAsync(cancellationToken); - _logger.LogTrace("Health check '{healthCheckName}' completed with status '{healthCheckStatus}'", check.Name, result.Status); - } - catch (Exception ex) - { - // We don't log this as an error because a health check failing shouldn't bring down the active task. - _logger.LogError(ex, "Health check '{healthCheckName}' threw an unexpected exception", check.Name); - result = new HealthCheckResult(HealthCheckStatus.Failed, ex, ex.Message, data: null); - } - - // This can only happen if the result is default(HealthCheckResult) - if (result.Status == HealthCheckStatus.Unknown) - { - // This is different from the case above. We throw here because a health check is doing something specifically incorrect. - var exception = new InvalidOperationException($"Health check '{check.Name}' returned a result with a status of Unknown"); - _logger.LogError(exception, "Health check '{healthCheckName}' returned a result with a status of Unknown", check.Name); - throw exception; - } - - results[check.Name] = result; - } - } - return new CompositeHealthCheckResult(results); - } - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckServiceCollectionExtensions.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckServiceCollectionExtensions.cs deleted file mode 100644 index f0caa8db1f..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthCheckServiceCollectionExtensions.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Diagnostics.HealthChecks; - -namespace Microsoft.Extensions.DependencyInjection -{ - /// - /// Provides extension methods for registering in an . - /// - public static class HealthCheckServiceCollectionExtensions - { - /// - /// Adds the to the container, using the provided delegate to register - /// health checks. - /// - /// - /// This operation is idempotent - multiple invocations will still only result in a single - /// instance in the . It can be invoked - /// multiple times in order to get access to the in multiple places. - /// - /// The to add the to. - /// An instance of from which health checks can be registered. - public static IHealthChecksBuilder AddHealthChecks(this IServiceCollection services) - { - services.TryAdd(ServiceDescriptor.Singleton()); - return new HealthChecksBuilder(services); - } - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilder.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilder.cs deleted file mode 100644 index 4e1d851eff..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilder.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.Extensions.DependencyInjection; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - internal class HealthChecksBuilder : IHealthChecksBuilder - { - public IServiceCollection Services { get; } - - public HealthChecksBuilder(IServiceCollection services) - { - Services = services; - } - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilderAddCheckExtensions.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilderAddCheckExtensions.cs deleted file mode 100644 index 3b3ee1eb54..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/HealthChecksBuilderAddCheckExtensions.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Diagnostics.HealthChecks; - -namespace Microsoft.Extensions.DependencyInjection -{ - /// - /// Provides extension methods for registering instances in an . - /// - public static class HealthChecksBuilderAddCheckExtensions - { - /// - /// Adds a new health check with the specified name and implementation. - /// - /// The to add the check to. - /// The name of the health check, which should indicate the component being checked. - /// A delegate which provides the code to execute when the health check is run. - /// The . - public static IHealthChecksBuilder AddCheck(this IHealthChecksBuilder builder, string name, Func> check) - { - builder.Services.AddSingleton(services => new HealthCheck(name, check)); - return builder; - } - - /// - /// Adds a new health check with the specified name and implementation. - /// - /// The to add the check to. - /// The name of the health check, which should indicate the component being checked. - /// A delegate which provides the code to execute when the health check is run. - /// The . - public static IHealthChecksBuilder AddCheck(this IHealthChecksBuilder builder, string name, Func> check) => - builder.AddCheck(name, _ => check()); - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthCheckService.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthCheckService.cs deleted file mode 100644 index 9c1bfbafc4..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthCheckService.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// A service which can be used to check the status of instances registered in the application. - /// - public interface IHealthCheckService - { - /// - /// A containing all the health checks registered in the application. - /// - /// - /// The key maps to the property of the health check, and the value is the - /// instance itself. - /// - IReadOnlyDictionary Checks { get; } - - /// - /// Runs all the health checks in the application and returns the aggregated status. - /// - /// A which can be used to cancel the health checks. - /// - /// A which will complete when all the health checks have been run, - /// yielding a containing the results. - /// - Task CheckHealthAsync(CancellationToken cancellationToken = default); - - /// - /// Runs the provided health checks and returns the aggregated status - /// - /// The instances to be run. - /// A which can be used to cancel the health checks. - /// - /// A which will complete when all the health checks have been run, - /// yielding a containing the results. - /// - Task CheckHealthAsync(IEnumerable checks, - CancellationToken cancellationToken = default); - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthChecksBuilder.cs b/src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthChecksBuilder.cs deleted file mode 100644 index 22cd691aa2..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/IHealthChecksBuilder.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.Extensions.DependencyInjection; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - /// - /// A builder used to collect instances of and register them on an . - /// - /// - /// This type wraps an and provides a place for health check components to attach extension - /// methods for registering themselves in the . - /// - public interface IHealthChecksBuilder - { - /// - /// Gets the into which instances should be registered. - /// - IServiceCollection Services { get; } - } -} diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj deleted file mode 100644 index 56f70f7a10..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - Components for performing health checks in .NET applications - -Commonly Used Types: -Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheckService -Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder - - netstandard2.0 - $(NoWarn);CS1591 - true - diagnostics;healthchecks - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/baseline.netcore.json b/src/Microsoft.Extensions.Diagnostics.HealthChecks/baseline.netcore.json deleted file mode 100644 index 4938a12605..0000000000 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/baseline.netcore.json +++ /dev/null @@ -1,334 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.Extensions.Diagnostics.HealthChecks, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.Extensions.DependencyInjection.HealthChecksBuilderAddCheckExtensions", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "AddCheck", - "Parameters": [ - { - "Name": "builder", - "Type": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder" - }, - { - "Name": "name", - "Type": "System.String" - }, - { - "Name": "check", - "Type": "System.Func>" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "AddCheck", - "Parameters": [ - { - "Name": "builder", - "Type": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder" - }, - { - "Name": "name", - "Type": "System.String" - }, - { - "Name": "check", - "Type": "System.Func>" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.DependencyInjection.HealthCheckServiceCollectionExtensions", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "AddHealthChecks", - "Parameters": [ - { - "Name": "services", - "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection" - } - ], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.CompositeHealthCheckResult", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Results", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IReadOnlyDictionary", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Status", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckStatus", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "results", - "Type": "System.Collections.Generic.IReadOnlyDictionary" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheck", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [ - "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck" - ], - "Members": [ - { - "Kind": "Method", - "Name": "get_Name", - "Parameters": [], - "ReturnType": "System.String", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "CheckHealthAsync", - "Parameters": [ - { - "Name": "cancellationToken", - "Type": "System.Threading.CancellationToken", - "DefaultValue": "default(System.Threading.CancellationToken)" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "name", - "Type": "System.String" - }, - { - "Name": "check", - "Type": "System.Func>" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckService", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [ - "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheckService" - ], - "Members": [ - { - "Kind": "Method", - "Name": "get_Checks", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IReadOnlyDictionary", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheckService", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "CheckHealthAsync", - "Parameters": [ - { - "Name": "cancellationToken", - "Type": "System.Threading.CancellationToken", - "DefaultValue": "default(System.Threading.CancellationToken)" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheckService", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "CheckHealthAsync", - "Parameters": [ - { - "Name": "checks", - "Type": "System.Collections.Generic.IEnumerable" - }, - { - "Name": "cancellationToken", - "Type": "System.Threading.CancellationToken", - "DefaultValue": "default(System.Threading.CancellationToken)" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheckService", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "healthChecks", - "Type": "System.Collections.Generic.IEnumerable" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "healthChecks", - "Type": "System.Collections.Generic.IEnumerable" - }, - { - "Name": "logger", - "Type": "Microsoft.Extensions.Logging.ILogger" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder", - "Visibility": "Public", - "Kind": "Interface", - "Abstract": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Services", - "Parameters": [], - "ReturnType": "Microsoft.Extensions.DependencyInjection.IServiceCollection", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheckService", - "Visibility": "Public", - "Kind": "Interface", - "Abstract": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Checks", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IReadOnlyDictionary", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "CheckHealthAsync", - "Parameters": [ - { - "Name": "cancellationToken", - "Type": "System.Threading.CancellationToken", - "DefaultValue": "default(System.Threading.CancellationToken)" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "CheckHealthAsync", - "Parameters": [ - { - "Name": "checks", - "Type": "System.Collections.Generic.IEnumerable" - }, - { - "Name": "cancellationToken", - "Type": "System.Threading.CancellationToken", - "DefaultValue": "default(System.Threading.CancellationToken)" - } - ], - "ReturnType": "System.Threading.Tasks.Task", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs b/src/Middleware/Diagnostics.Abstractions/src/CompilationFailure.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs rename to src/Middleware/Diagnostics.Abstractions/src/CompilationFailure.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs b/src/Middleware/Diagnostics.Abstractions/src/DiagnosticMessage.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs rename to src/Middleware/Diagnostics.Abstractions/src/DiagnosticMessage.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs b/src/Middleware/Diagnostics.Abstractions/src/ICompilationException.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs rename to src/Middleware/Diagnostics.Abstractions/src/ICompilationException.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs b/src/Middleware/Diagnostics.Abstractions/src/IExceptionHandlerFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs rename to src/Middleware/Diagnostics.Abstractions/src/IExceptionHandlerFeature.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerPathFeature.cs b/src/Middleware/Diagnostics.Abstractions/src/IExceptionHandlerPathFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerPathFeature.cs rename to src/Middleware/Diagnostics.Abstractions/src/IExceptionHandlerPathFeature.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs b/src/Middleware/Diagnostics.Abstractions/src/IStatusCodePagesFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs rename to src/Middleware/Diagnostics.Abstractions/src/IStatusCodePagesFeature.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs b/src/Middleware/Diagnostics.Abstractions/src/IStatusCodeReExecuteFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs rename to src/Middleware/Diagnostics.Abstractions/src/IStatusCodeReExecuteFeature.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj b/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj rename to src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/baseline.netcore.json b/src/Middleware/Diagnostics.Abstractions/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.Abstractions/baseline.netcore.json rename to src/Middleware/Diagnostics.Abstractions/src/baseline.netcore.json diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageOptions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Internal/DiagnosticsEntityFrameworkCoreLoggerExtensions.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Internal/DiagnosticsEntityFrameworkCoreLoggerExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Internal/DiagnosticsEntityFrameworkCoreLoggerExtensions.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Internal/DiagnosticsEntityFrameworkCoreLoggerExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj similarity index 53% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj index 5e29b7926a..f418a50148 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj @@ -9,13 +9,13 @@ - + - - - + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/MigrationsEndPointExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/MigrationsEndPointExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/MigrationsEndPointMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/MigrationsEndPointMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/MigrationsEndPointOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/MigrationsEndPointOptions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Properties/Strings.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Properties/Strings.Designer.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Strings.resx b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Strings.resx similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Strings.resx rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Strings.resx diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.Designer.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.Designer.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.Designer.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.cshtml diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPageModel.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPageModel.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/ErrorPage.css b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/ErrorPage.css similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/ErrorPage.css rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/ErrorPage.css diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/baseline.netcore.json b/src/Middleware/Diagnostics.EntityFrameworkCore/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/baseline.netcore.json rename to src/Middleware/Diagnostics.EntityFrameworkCore/src/baseline.netcore.json diff --git a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj new file mode 100644 index 0000000000..a82ac7c490 --- /dev/null +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj @@ -0,0 +1,16 @@ + + + + $(StandardTestTfms) + + Diagnostics.EFCore.FunctionalTests + + + + + + + + + + diff --git a/test/Diagnostics.EFCore.FunctionalTests/Helpers/PlatformHelper.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Helpers/PlatformHelper.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/Helpers/PlatformHelper.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Helpers/PlatformHelper.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/Helpers/StringHelpers.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Helpers/StringHelpers.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/Helpers/StringHelpers.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Helpers/StringHelpers.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/Helpers/TestLoggerProvider.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Helpers/TestLoggerProvider.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/Helpers/TestLoggerProvider.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Helpers/TestLoggerProvider.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/MigrationsEndPointMiddlewareTest.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/MigrationsEndPointMiddlewareTest.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/SqlServerTestStore.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/SqlServerTestStore.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/TestModels/Blog.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/Blog.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/TestModels/Blog.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/Blog.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContext.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContext.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContext.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContext.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithMigrations.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithMigrations.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs similarity index 100% rename from test/Diagnostics.EFCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseErrorPageOptionsTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseErrorPageOptionsTest.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseErrorPageTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseErrorPageTest.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Helpers/AssertHelpers.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Helpers/AssertHelpers.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Helpers/StringHelpers.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Helpers/StringHelpers.cs diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj new file mode 100644 index 0000000000..fc5a2b350f --- /dev/null +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj @@ -0,0 +1,13 @@ + + + + $(StandardTestTfms) + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/TestHelperExtensions.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs rename to src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/TestHelperExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/.csslintrc b/src/Middleware/Diagnostics/src/.csslintrc similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/.csslintrc rename to src/Middleware/Diagnostics/src/.csslintrc diff --git a/src/Microsoft.AspNetCore.Diagnostics/.jshintrc b/src/Middleware/Diagnostics/src/.jshintrc similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/.jshintrc rename to src/Middleware/Diagnostics/src/.jshintrc diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorModel.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorModel.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.Designer.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.Designer.cs rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.css b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.css similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.css rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.css diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.js b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.js similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.js rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.js diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPageModel.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs rename to src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPageModel.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs rename to src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs rename to src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerFeature.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs rename to src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs rename to src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerOptions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/Internal/DiagnosticsLoggerExtensions.cs b/src/Middleware/Diagnostics/src/Internal/DiagnosticsLoggerExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/Internal/DiagnosticsLoggerExtensions.cs rename to src/Middleware/Diagnostics/src/Internal/DiagnosticsLoggerExtensions.cs diff --git a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj new file mode 100644 index 0000000000..a5ae405dcd --- /dev/null +++ b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj @@ -0,0 +1,30 @@ + + + + ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware + netstandard2.0 + $(NoWarn);CS1591 + true + aspnetcore;diagnostics + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs b/src/Middleware/Diagnostics/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs rename to src/Middleware/Diagnostics/src/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs b/src/Middleware/Diagnostics/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs rename to src/Middleware/Diagnostics/src/Properties/Resources.Designer.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/Resources.resx b/src/Middleware/Diagnostics/src/Resources.resx similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/Resources.resx rename to src/Middleware/Diagnostics/src/Resources.resx diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodeContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs rename to src/Middleware/Diagnostics/src/StatusCodePage/StatusCodeContext.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs rename to src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs rename to src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesFeature.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs rename to src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs rename to src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesOptions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodeReExecuteFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs rename to src/Middleware/Diagnostics/src/StatusCodePage/StatusCodeReExecuteFeature.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/Obsolete/WelcomePage.cs b/src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/Obsolete/WelcomePage.cs rename to src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/Obsolete/WelcomePage.cshtml b/src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/Obsolete/WelcomePage.cshtml rename to src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cshtml diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.Designer.cs b/src/Middleware/Diagnostics/src/WelcomePage/Views/WelcomePage.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.Designer.cs rename to src/Middleware/Diagnostics/src/WelcomePage/Views/WelcomePage.Designer.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml b/src/Middleware/Diagnostics/src/WelcomePage/Views/WelcomePage.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml rename to src/Middleware/Diagnostics/src/WelcomePage/Views/WelcomePage.cshtml diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs b/src/Middleware/Diagnostics/src/WelcomePage/WelcomePageExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs rename to src/Middleware/Diagnostics/src/WelcomePage/WelcomePageExtensions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs b/src/Middleware/Diagnostics/src/WelcomePage/WelcomePageMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs rename to src/Middleware/Diagnostics/src/WelcomePage/WelcomePageMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs b/src/Middleware/Diagnostics/src/WelcomePage/WelcomePageOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs rename to src/Middleware/Diagnostics/src/WelcomePage/WelcomePageOptions.cs diff --git a/src/Microsoft.AspNetCore.Diagnostics/_gruntfile.js b/src/Middleware/Diagnostics/src/_gruntfile.js similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/_gruntfile.js rename to src/Middleware/Diagnostics/src/_gruntfile.js diff --git a/src/Microsoft.AspNetCore.Diagnostics/_gruntfile.readme b/src/Middleware/Diagnostics/src/_gruntfile.readme similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/_gruntfile.readme rename to src/Middleware/Diagnostics/src/_gruntfile.readme diff --git a/src/Microsoft.AspNetCore.Diagnostics/_package.json b/src/Middleware/Diagnostics/src/_package.json similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/_package.json rename to src/Middleware/Diagnostics/src/_package.json diff --git a/src/Microsoft.AspNetCore.Diagnostics/baseline.netcore.json b/src/Middleware/Diagnostics/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.Diagnostics/baseline.netcore.json rename to src/Middleware/Diagnostics/src/baseline.netcore.json diff --git a/test/Diagnostics.FunctionalTests/DatabaseErrorPageSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs similarity index 100% rename from test/Diagnostics.FunctionalTests/DatabaseErrorPageSampleTest.cs rename to src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs diff --git a/test/Diagnostics.FunctionalTests/DeveloperExceptionPageSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/DeveloperExceptionPageSampleTest.cs similarity index 100% rename from test/Diagnostics.FunctionalTests/DeveloperExceptionPageSampleTest.cs rename to src/Middleware/Diagnostics/test/FunctionalTests/DeveloperExceptionPageSampleTest.cs diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj new file mode 100644 index 0000000000..5232cb853c --- /dev/null +++ b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj @@ -0,0 +1,25 @@ + + + + $(StandardTestTfms) + false + false + + Diagnostics.FunctionalTests + + + + + + + + + + + + + + + + + diff --git a/test/Diagnostics.FunctionalTests/ExceptionHandlerSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/ExceptionHandlerSampleTest.cs similarity index 100% rename from test/Diagnostics.FunctionalTests/ExceptionHandlerSampleTest.cs rename to src/Middleware/Diagnostics/test/FunctionalTests/ExceptionHandlerSampleTest.cs diff --git a/test/Diagnostics.FunctionalTests/MiddlewareAnalysisSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/MiddlewareAnalysisSampleTest.cs similarity index 100% rename from test/Diagnostics.FunctionalTests/MiddlewareAnalysisSampleTest.cs rename to src/Middleware/Diagnostics/test/FunctionalTests/MiddlewareAnalysisSampleTest.cs diff --git a/test/Diagnostics.FunctionalTests/StatusCodeSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/StatusCodeSampleTest.cs similarity index 100% rename from test/Diagnostics.FunctionalTests/StatusCodeSampleTest.cs rename to src/Middleware/Diagnostics/test/FunctionalTests/StatusCodeSampleTest.cs diff --git a/test/Diagnostics.FunctionalTests/TestFixture.cs b/src/Middleware/Diagnostics/test/FunctionalTests/TestFixture.cs similarity index 100% rename from test/Diagnostics.FunctionalTests/TestFixture.cs rename to src/Middleware/Diagnostics/test/FunctionalTests/TestFixture.cs diff --git a/test/Diagnostics.FunctionalTests/WelcomePageSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/WelcomePageSampleTest.cs similarity index 100% rename from test/Diagnostics.FunctionalTests/WelcomePageSampleTest.cs rename to src/Middleware/Diagnostics/test/FunctionalTests/WelcomePageSampleTest.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs rename to src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ElmLoggerTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs rename to src/Middleware/Diagnostics/test/UnitTests/ElmLoggerTest.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ElmMiddlewareTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs rename to src/Middleware/Diagnostics/test/UnitTests/ElmMiddlewareTest.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionDetailsProviderTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ExceptionDetailsProviderTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionDetailsProviderTest.cs rename to src/Middleware/Diagnostics/test/UnitTests/ExceptionDetailsProviderTest.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs rename to src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs diff --git a/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj new file mode 100644 index 0000000000..14c21556fe --- /dev/null +++ b/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj @@ -0,0 +1,34 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Resources/TestFiles/EmbeddedSourceFile.txt b/src/Middleware/Diagnostics/test/UnitTests/Resources/TestFiles/EmbeddedSourceFile.txt similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/Resources/TestFiles/EmbeddedSourceFile.txt rename to src/Middleware/Diagnostics/test/UnitTests/Resources/TestFiles/EmbeddedSourceFile.txt diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs b/src/Middleware/Diagnostics/test/UnitTests/TestDiagnosticListener.cs similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs rename to src/Middleware/Diagnostics/test/UnitTests/TestDiagnosticListener.cs diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/TestFiles/SourceFile.txt b/src/Middleware/Diagnostics/test/UnitTests/TestFiles/SourceFile.txt similarity index 100% rename from test/Microsoft.AspNetCore.Diagnostics.Tests/TestFiles/SourceFile.txt rename to src/Middleware/Diagnostics/test/UnitTests/TestFiles/SourceFile.txt diff --git a/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj b/src/Middleware/Diagnostics/test/testassets/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj similarity index 100% rename from test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj rename to src/Middleware/Diagnostics/test/testassets/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj diff --git a/test/ClassLibraryWithPortablePdbs/ExceptionType.cs b/src/Middleware/Diagnostics/test/testassets/ClassLibraryWithPortablePdbs/ExceptionType.cs similarity index 100% rename from test/ClassLibraryWithPortablePdbs/ExceptionType.cs rename to src/Middleware/Diagnostics/test/testassets/ClassLibraryWithPortablePdbs/ExceptionType.cs diff --git a/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj new file mode 100644 index 0000000000..9f7630aedb --- /dev/null +++ b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj @@ -0,0 +1,18 @@ + + + + net461;netcoreapp2.0;netcoreapp2.1 + + + + + + + + + + + + + + diff --git a/samples/DatabaseErrorPageSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/Startup.cs similarity index 100% rename from samples/DatabaseErrorPageSample/Startup.cs rename to src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/Startup.cs diff --git a/samples/DatabaseErrorPageSample/web.config b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/web.config similarity index 100% rename from samples/DatabaseErrorPageSample/web.config rename to src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/web.config diff --git a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj new file mode 100644 index 0000000000..1bc19e49c5 --- /dev/null +++ b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj @@ -0,0 +1,16 @@ + + + + net461;netcoreapp2.0;netcoreapp2.1 + + + + + + + + + + + + diff --git a/samples/DeveloperExceptionPageSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs similarity index 100% rename from samples/DeveloperExceptionPageSample/Startup.cs rename to src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs diff --git a/samples/DeveloperExceptionPageSample/web.config b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/web.config similarity index 100% rename from samples/DeveloperExceptionPageSample/web.config rename to src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/web.config diff --git a/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj b/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj new file mode 100644 index 0000000000..7710795716 --- /dev/null +++ b/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj @@ -0,0 +1,15 @@ + + + + net461;netcoreapp2.0;netcoreapp2.1 + + + + + + + + + + + diff --git a/samples/ExceptionHandlerSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/Startup.cs similarity index 100% rename from samples/ExceptionHandlerSample/Startup.cs rename to src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/Startup.cs diff --git a/samples/ElmPageSample/web.config b/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/web.config similarity index 100% rename from samples/ElmPageSample/web.config rename to src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/web.config diff --git a/samples/ElmPageSample/wwwroot/error.html b/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/wwwroot/error.html similarity index 100% rename from samples/ElmPageSample/wwwroot/error.html rename to src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/wwwroot/error.html diff --git a/src/Middleware/Diagnostics/test/testassets/HealthChecksSample/HealthChecksSample.csproj b/src/Middleware/Diagnostics/test/testassets/HealthChecksSample/HealthChecksSample.csproj new file mode 100644 index 0000000000..9aa0966f08 --- /dev/null +++ b/src/Middleware/Diagnostics/test/testassets/HealthChecksSample/HealthChecksSample.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp2.0 + + + + + + + + + + diff --git a/samples/HealthChecksSample/Program.cs b/src/Middleware/Diagnostics/test/testassets/HealthChecksSample/Program.cs similarity index 100% rename from samples/HealthChecksSample/Program.cs rename to src/Middleware/Diagnostics/test/testassets/HealthChecksSample/Program.cs diff --git a/samples/HealthChecksSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/HealthChecksSample/Startup.cs similarity index 100% rename from samples/HealthChecksSample/Startup.cs rename to src/Middleware/Diagnostics/test/testassets/HealthChecksSample/Startup.cs diff --git a/samples/StatusCodePagesSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/Startup.cs similarity index 100% rename from samples/StatusCodePagesSample/Startup.cs rename to src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/Startup.cs diff --git a/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj b/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj new file mode 100644 index 0000000000..40481fde37 --- /dev/null +++ b/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj @@ -0,0 +1,13 @@ + + + + net461;netcoreapp2.0;netcoreapp2.1 + + + + + + + + + diff --git a/samples/ExceptionHandlerSample/web.config b/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/web.config similarity index 100% rename from samples/ExceptionHandlerSample/web.config rename to src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/web.config diff --git a/samples/WelcomePageSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/Startup.cs similarity index 100% rename from samples/WelcomePageSample/Startup.cs rename to src/Middleware/Diagnostics/test/testassets/WelcomePageSample/Startup.cs diff --git a/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj b/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj new file mode 100644 index 0000000000..40481fde37 --- /dev/null +++ b/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj @@ -0,0 +1,13 @@ + + + + net461;netcoreapp2.0;netcoreapp2.1 + + + + + + + + + diff --git a/samples/MiddlewareAnalysisSample/web.config b/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/web.config similarity index 100% rename from samples/MiddlewareAnalysisSample/web.config rename to src/Middleware/Diagnostics/test/testassets/WelcomePageSample/web.config diff --git a/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj b/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj new file mode 100644 index 0000000000..31a5713044 --- /dev/null +++ b/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj @@ -0,0 +1,16 @@ + + + + net461;netcoreapp2.0;netcoreapp2.1 + + + + + + + + + + + + diff --git a/samples/MiddlewareAnalysisSample/Startup.cs b/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/Startup.cs similarity index 100% rename from samples/MiddlewareAnalysisSample/Startup.cs rename to src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/Startup.cs diff --git a/samples/StatusCodePagesSample/web.config b/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/web.config similarity index 100% rename from samples/StatusCodePagesSample/web.config rename to src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/web.config diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs b/src/Middleware/MiddlewareAnalysis/src/AnalysisBuilder.cs similarity index 100% rename from src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs rename to src/Middleware/MiddlewareAnalysis/src/AnalysisBuilder.cs diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs b/src/Middleware/MiddlewareAnalysis/src/AnalysisMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs rename to src/Middleware/MiddlewareAnalysis/src/AnalysisMiddleware.cs diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs b/src/Middleware/MiddlewareAnalysis/src/AnalysisServiceCollectionExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs rename to src/Middleware/MiddlewareAnalysis/src/AnalysisServiceCollectionExtensions.cs diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs b/src/Middleware/MiddlewareAnalysis/src/AnalysisStartupFilter.cs similarity index 100% rename from src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs rename to src/Middleware/MiddlewareAnalysis/src/AnalysisStartupFilter.cs diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj similarity index 51% rename from src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj rename to src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj index c4a3ad1b67..5f6ec94f46 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj +++ b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/baseline.netcore.json b/src/Middleware/MiddlewareAnalysis/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.MiddlewareAnalysis/baseline.netcore.json rename to src/Middleware/MiddlewareAnalysis/src/baseline.netcore.json diff --git a/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj new file mode 100644 index 0000000000..d49320ea80 --- /dev/null +++ b/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj @@ -0,0 +1,22 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs b/src/Middleware/MiddlewareAnalysis/test/MiddlewareAnalysisTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs rename to src/Middleware/MiddlewareAnalysis/test/MiddlewareAnalysisTests.cs diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs b/src/Middleware/MiddlewareAnalysis/test/TestDiagnosticListener.cs similarity index 100% rename from test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs rename to src/Middleware/MiddlewareAnalysis/test/TestDiagnosticListener.cs diff --git a/src/shared/AttributeValue.cs b/src/Shared/Diagnostics/AttributeValue.cs similarity index 100% rename from src/shared/AttributeValue.cs rename to src/Shared/Diagnostics/AttributeValue.cs diff --git a/src/shared/BaseView.cs b/src/Shared/Diagnostics/BaseView.cs similarity index 100% rename from src/shared/BaseView.cs rename to src/Shared/Diagnostics/BaseView.cs diff --git a/src/Shared/Diagnostics/Directory.Build.props b/src/Shared/Diagnostics/Directory.Build.props new file mode 100644 index 0000000000..446e684185 --- /dev/null +++ b/src/Shared/Diagnostics/Directory.Build.props @@ -0,0 +1,5 @@ + + + false + + \ No newline at end of file diff --git a/src/shared/HelperResult.cs b/src/Shared/Diagnostics/HelperResult.cs similarity index 100% rename from src/shared/HelperResult.cs rename to src/Shared/Diagnostics/HelperResult.cs diff --git a/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj b/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj deleted file mode 100644 index de3922cced..0000000000 --- a/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - $(StandardTestTfms) - - Diagnostics.EFCore.FunctionalTests - - - - - - - - - - - - - - - - - diff --git a/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj b/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj deleted file mode 100644 index 34524fc4a6..0000000000 --- a/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - $(StandardTestTfms) - false - false - - Diagnostics.FunctionalTests - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/Diagnostics.FunctionalTests/ElmPageSampleTest.cs b/test/Diagnostics.FunctionalTests/ElmPageSampleTest.cs deleted file mode 100644 index d5fc265e55..0000000000 --- a/test/Diagnostics.FunctionalTests/ElmPageSampleTest.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Net; -using System.Net.Http; -using System.Threading.Tasks; -using Xunit; - -namespace Microsoft.AspNetCore.Diagnostics.FunctionalTests -{ - public class ElmPageSampleTest : IClassFixture> - { - public ElmPageSampleTest(TestFixture fixture) - { - Client = fixture.Client; - } - - public HttpClient Client { get; } - - [Fact] - public async Task ElmPagePage_ShowsError() - { - // Arrange - var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/throws"); - - // Act - var response = await Client.SendAsync(request); - - // Assert - var body = await response.Content.ReadAsStringAsync(); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Contains("Elm Logs", body); - } - } -} diff --git a/test/Directory.Build.props b/test/Directory.Build.props deleted file mode 100644 index 6ab2251a4a..0000000000 --- a/test/Directory.Build.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(StandardTestTfms);net461 - - - - - - diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj deleted file mode 100644 index 1bafd74701..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - - - diff --git a/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/HealthCheckMiddlewareTests.cs b/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/HealthCheckMiddlewareTests.cs deleted file mode 100644 index c6aaee52ff..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/HealthCheckMiddlewareTests.cs +++ /dev/null @@ -1,243 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Net; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.TestHost; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Diagnostics.HealthChecks; -using Newtonsoft.Json; -using Xunit; - -namespace Microsoft.AspNetCore.Diagnostics.HealthChecks -{ - public class HealthCheckMiddlewareTests - { - [Theory] - [InlineData("/frob")] - [InlineData("/health/")] // Match is exact, for now at least - public async Task IgnoresRequestThatDoesNotMatchPath(string requestPath) - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks(); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync(requestPath); - Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); - } - - [Theory] - [InlineData("/health")] - [InlineData("/Health")] - [InlineData("/HEALTH")] - public async Task ReturnsEmptyHealthyRequestIfNoHealthChecksRegistered(string requestPath) - { - var expectedJson = JsonConvert.SerializeObject(new - { - status = "Healthy", - results = new { } - }, Formatting.None); - - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks(); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync(requestPath); - - var result = await response.Content.ReadAsStringAsync(); - Assert.Equal(expectedJson, result); - } - - [Fact] - public async Task ReturnsResultsFromHealthChecks() - { - var expectedJson = JsonConvert.SerializeObject(new - { - status = "Unhealthy", - results = new - { - Foo = new - { - status = "Healthy", - description = "Good to go!", - data = new { } - }, - Bar = new - { - status = "Degraded", - description = "Feeling a bit off.", - data = new { someUsefulAttribute = 42 } - }, - Baz = new - { - status = "Unhealthy", - description = "Not feeling good at all", - data = new { } - }, - Boz = new - { - status = "Unhealthy", - description = string.Empty, - data = new { } - }, - }, - }, Formatting.None); - - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks() - .AddCheck("Foo", () => Task.FromResult(HealthCheckResult.Healthy("Good to go!"))) - .AddCheck("Bar", () => Task.FromResult(HealthCheckResult.Degraded("Feeling a bit off.", new Dictionary() - { - { "someUsefulAttribute", 42 } - }))) - .AddCheck("Baz", () => Task.FromResult(HealthCheckResult.Unhealthy("Not feeling good at all", new Exception("Bad times")))) - .AddCheck("Boz", () => Task.FromResult(HealthCheckResult.Unhealthy(new Exception("Very bad times")))); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync("/health"); - - var result = await response.Content.ReadAsStringAsync(); - Assert.Equal(expectedJson, result); - } - - [Fact] - public async Task StatusCodeIs200IfNoChecks() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks(); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync("/health"); - - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } - - [Fact] - public async Task StatusCodeIs200IfAllChecksHealthy() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks() - .AddCheck("Foo", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))) - .AddCheck("Bar", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))) - .AddCheck("Baz", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync("/health"); - - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } - - [Fact] - public async Task StatusCodeIs200IfCheckIsDegraded() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks() - .AddCheck("Foo", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))) - .AddCheck("Bar", () => Task.FromResult(HealthCheckResult.Degraded("Not so great."))) - .AddCheck("Baz", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync("/health"); - - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } - - [Fact] - public async Task StatusCodeIs503IfCheckIsUnhealthy() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks() - .AddCheck("Foo", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))) - .AddCheck("Bar", () => Task.FromResult(HealthCheckResult.Unhealthy("Pretty bad."))) - .AddCheck("Baz", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync("/health"); - - Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); - } - - [Fact] - public async Task StatusCodeIs500IfCheckIsFailed() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseHealthChecks("/health"); - }) - .ConfigureServices(services => - { - services.AddHealthChecks() - .AddCheck("Foo", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))) - .AddCheck("Bar", () => Task.FromResult(new HealthCheckResult(HealthCheckStatus.Failed, null, null, null))) - .AddCheck("Baz", () => Task.FromResult(HealthCheckResult.Healthy("A-ok!"))); - }); - var server = new TestServer(builder); - var client = server.CreateClient(); - - var response = await client.GetAsync("/health"); - - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - } - } -} diff --git a/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj deleted file mode 100644 index 001b0c0990..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - $(StandardTestTfms) - Microsoft.AspNetCore.Diagnostics.HealthChecks - - - - - - - - - - - - - - - diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj deleted file mode 100644 index 2e9496869e..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj deleted file mode 100644 index f96448c309..0000000000 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - diff --git a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/CompositeHealthCheckResultTests.cs b/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/CompositeHealthCheckResultTests.cs deleted file mode 100644 index 3852969cda..0000000000 --- a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/CompositeHealthCheckResultTests.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using Xunit; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks.Tests -{ - public class CompositeHealthCheckResultTests - { - [Theory] - [InlineData(HealthCheckStatus.Healthy)] - [InlineData(HealthCheckStatus.Degraded)] - [InlineData(HealthCheckStatus.Unhealthy)] - [InlineData(HealthCheckStatus.Failed)] - public void Status_MatchesWorstStatusInResults(HealthCheckStatus statusValue) - { - var result = new CompositeHealthCheckResult(new Dictionary() - { - {"Foo", HealthCheckResult.Healthy() }, - {"Bar", HealthCheckResult.Healthy() }, - {"Baz", new HealthCheckResult(statusValue, exception: null, description: null, data: null) }, - {"Quick", HealthCheckResult.Healthy() }, - {"Quack", HealthCheckResult.Healthy() }, - {"Quock", HealthCheckResult.Healthy() }, - }); - - Assert.Equal(statusValue, result.Status); - } - } -} diff --git a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthCheckServiceTests.cs b/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthCheckServiceTests.cs deleted file mode 100644 index 2a7fa8395f..0000000000 --- a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthCheckServiceTests.cs +++ /dev/null @@ -1,256 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Testing; -using Xunit; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - public class HealthCheckServiceTests - { - [Fact] - public void Constructor_BuildsDictionaryOfChecks() - { - // Arrange - var fooCheck = new HealthCheck("Foo", _ => Task.FromResult(HealthCheckResult.Healthy())); - var barCheck = new HealthCheck("Bar", _ => Task.FromResult(HealthCheckResult.Healthy())); - var bazCheck = new HealthCheck("Baz", _ => Task.FromResult(HealthCheckResult.Healthy())); - var checks = new[] { fooCheck, barCheck, bazCheck }; - - // Act - var service = new HealthCheckService(checks); - - // Assert - Assert.Same(fooCheck, service.Checks["Foo"]); - Assert.Same(barCheck, service.Checks["Bar"]); - Assert.Same(bazCheck, service.Checks["Baz"]); - Assert.Equal(3, service.Checks.Count); - } - - [Fact] - public void Constructor_ThrowsUsefulExceptionForDuplicateNames() - { - // Arrange - var checks = new[] - { - new HealthCheck("Foo", _ => Task.FromResult(HealthCheckResult.Healthy())), - new HealthCheck("Foo", _ => Task.FromResult(HealthCheckResult.Healthy())), - new HealthCheck("Bar", _ => Task.FromResult(HealthCheckResult.Healthy())), - new HealthCheck("Baz", _ => Task.FromResult(HealthCheckResult.Healthy())), - new HealthCheck("Baz", _ => Task.FromResult(HealthCheckResult.Healthy())), - }; - - // Act - var exception = Assert.Throws(() => new HealthCheckService(checks)); - - // Assert - Assert.Equal($"Duplicate health checks were registered with the name(s): Foo, Baz{Environment.NewLine}Parameter name: healthChecks", exception.Message); - } - - [Fact] - public async Task CheckAsync_RunsAllChecksAndAggregatesResultsAsync() - { - const string DataKey = "Foo"; - const string DataValue = "Bar"; - const string DegradedMessage = "I'm not feeling so good"; - const string UnhealthyMessage = "Halp!"; - const string HealthyMessage = "Everything is A-OK"; - var exception = new Exception("Things are pretty bad!"); - - // Arrange - var data = new Dictionary() - { - { DataKey, DataValue } - }; - - var healthyCheck = new HealthCheck("HealthyCheck", _ => Task.FromResult(HealthCheckResult.Healthy(HealthyMessage, data))); - var degradedCheck = new HealthCheck("DegradedCheck", _ => Task.FromResult(HealthCheckResult.Degraded(DegradedMessage))); - var unhealthyCheck = new HealthCheck("UnhealthyCheck", _ => Task.FromResult(HealthCheckResult.Unhealthy(UnhealthyMessage, exception))); - - var service = new HealthCheckService(new[] - { - healthyCheck, - degradedCheck, - unhealthyCheck, - }); - - // Act - var results = await service.CheckHealthAsync(); - - // Assert - Assert.Collection(results.Results, - actual => - { - Assert.Equal(healthyCheck.Name, actual.Key); - Assert.Equal(HealthyMessage, actual.Value.Description); - Assert.Equal(HealthCheckStatus.Healthy, actual.Value.Status); - Assert.Null(actual.Value.Exception); - Assert.Collection(actual.Value.Data, item => - { - Assert.Equal(DataKey, item.Key); - Assert.Equal(DataValue, item.Value); - }); - }, - actual => - { - Assert.Equal(degradedCheck.Name, actual.Key); - Assert.Equal(DegradedMessage, actual.Value.Description); - Assert.Equal(HealthCheckStatus.Degraded, actual.Value.Status); - Assert.Null(actual.Value.Exception); - Assert.Empty(actual.Value.Data); - }, - actual => - { - Assert.Equal(unhealthyCheck.Name, actual.Key); - Assert.Equal(UnhealthyMessage, actual.Value.Description); - Assert.Equal(HealthCheckStatus.Unhealthy, actual.Value.Status); - Assert.Same(exception, actual.Value.Exception); - Assert.Empty(actual.Value.Data); - }); - } - - [Fact] - public async Task CheckAsync_RunsProvidedChecksAndAggregatesResultsAsync() - { - const string DataKey = "Foo"; - const string DataValue = "Bar"; - const string DegradedMessage = "I'm not feeling so good"; - const string UnhealthyMessage = "Halp!"; - const string HealthyMessage = "Everything is A-OK"; - var exception = new Exception("Things are pretty bad!"); - - // Arrange - var data = new Dictionary - { - { DataKey, DataValue } - }; - - var healthyCheck = new HealthCheck("HealthyCheck", _ => Task.FromResult(HealthCheckResult.Healthy(HealthyMessage, data))); - var degradedCheck = new HealthCheck("DegradedCheck", _ => Task.FromResult(HealthCheckResult.Degraded(DegradedMessage))); - var unhealthyCheck = new HealthCheck("UnhealthyCheck", _ => Task.FromResult(HealthCheckResult.Unhealthy(UnhealthyMessage, exception))); - - var service = new HealthCheckService(new[] - { - healthyCheck, - degradedCheck, - unhealthyCheck, - }); - - // Act - var results = await service.CheckHealthAsync(new[] - { - service.Checks["HealthyCheck"] - }); - - // Assert - Assert.Collection(results.Results, - actual => - { - Assert.Equal(healthyCheck.Name, actual.Key); - Assert.Equal(HealthyMessage, actual.Value.Description); - Assert.Equal(HealthCheckStatus.Healthy, actual.Value.Status); - Assert.Null(actual.Value.Exception); - Assert.Collection(actual.Value.Data, item => - { - Assert.Equal(DataKey, item.Key); - Assert.Equal(DataValue, item.Value); - }); - }); - } - - [Fact] - public async Task CheckHealthAsync_ConvertsExceptionInHealthCheckerToFailedResultAsync() - { - // Arrange - var thrownException = new InvalidOperationException("Whoops!"); - var faultedException = new InvalidOperationException("Ohnoes!"); - var service = new HealthCheckService(new[] - { - new HealthCheck("Throws", ct => throw thrownException), - new HealthCheck("Faults", ct => Task.FromException(faultedException)), - new HealthCheck("Succeeds", ct => Task.FromResult(HealthCheckResult.Healthy())), - }); - - // Act - var results = await service.CheckHealthAsync(); - - // Assert - Assert.Collection(results.Results, - actual => - { - Assert.Equal("Throws", actual.Key); - Assert.Equal(thrownException.Message, actual.Value.Description); - Assert.Equal(HealthCheckStatus.Failed, actual.Value.Status); - Assert.Same(thrownException, actual.Value.Exception); - }, - actual => - { - Assert.Equal("Faults", actual.Key); - Assert.Equal(faultedException.Message, actual.Value.Description); - Assert.Equal(HealthCheckStatus.Failed, actual.Value.Status); - Assert.Same(faultedException, actual.Value.Exception); - }, - actual => - { - Assert.Equal("Succeeds", actual.Key); - Assert.Empty(actual.Value.Description); - Assert.Equal(HealthCheckStatus.Healthy, actual.Value.Status); - Assert.Null(actual.Value.Exception); - }); - } - - [Fact] - public async Task CheckHealthAsync_SetsUpALoggerScopeForEachCheck() - { - // Arrange - var sink = new TestSink(); - var check = new HealthCheck("TestScope", cancellationToken => - { - Assert.Collection(sink.Scopes, - actual => - { - Assert.Equal(actual.LoggerName, typeof(HealthCheckService).FullName); - Assert.Collection((IEnumerable>)actual.Scope, - item => - { - Assert.Equal("HealthCheckName", item.Key); - Assert.Equal("TestScope", item.Value); - }); - }); - return Task.FromResult(HealthCheckResult.Healthy()); - }); - var loggerFactory = new TestLoggerFactory(sink, enabled: true); - var service = new HealthCheckService(new[] { check }, loggerFactory.CreateLogger()); - - // Act - var results = await service.CheckHealthAsync(); - - // Assert - Assert.Collection(results.Results, actual => - { - Assert.Equal("TestScope", actual.Key); - Assert.Equal(HealthCheckStatus.Healthy, actual.Value.Status); - }); - } - - [Fact] - public async Task CheckHealthAsync_ThrowsIfCheckReturnsUnknownStatusResult() - { - // Arrange - var service = new HealthCheckService(new[] - { - new HealthCheck("Kaboom", ct => Task.FromResult(default(HealthCheckResult))), - }); - - // Act - var ex = await Assert.ThrowsAsync(() => service.CheckHealthAsync()); - - // Assert - Assert.Equal("Health check 'Kaboom' returned a result with a status of Unknown", ex.Message); - } - } -} diff --git a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthChecksBuilderTests.cs b/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthChecksBuilderTests.cs deleted file mode 100644 index a24a4a5b4e..0000000000 --- a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/HealthChecksBuilderTests.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Xunit; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - public class HealthChecksBuilderTests - { - [Fact] - public void ChecksCanBeRegisteredInMultipleCallsToAddHealthChecks() - { - var services = new ServiceCollection(); - services.AddHealthChecks() - .AddCheck("Foo", () => Task.FromResult(HealthCheckResult.Healthy())); - services.AddHealthChecks() - .AddCheck("Bar", () => Task.FromResult(HealthCheckResult.Healthy())); - - // Act - var healthCheckService = services.BuildServiceProvider().GetRequiredService(); - - // Assert - Assert.Collection(healthCheckService.Checks, - actual => Assert.Equal("Foo", actual.Key), - actual => Assert.Equal("Bar", actual.Key)); - } - } -} diff --git a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj b/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj deleted file mode 100644 index 9dc8de73e9..0000000000 --- a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - $(StandardTestTfms) - Microsoft.Extensions.Diagnostics.HealthChecks - - - - - - - - - - - - - - diff --git a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/ServiceCollectionExtensionsTests.cs b/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/ServiceCollectionExtensionsTests.cs deleted file mode 100644 index b33bd36eb6..0000000000 --- a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/ServiceCollectionExtensionsTests.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.Extensions.DependencyInjection; -using Xunit; - -namespace Microsoft.Extensions.Diagnostics.HealthChecks -{ - public class ServiceCollectionExtensionsTests - { - [Fact] - public void AddHealthChecks_RegistersSingletonHealthCheckServiceIdempotently() - { - // Arrange - var services = new ServiceCollection(); - - // Act - services.AddHealthChecks(); - services.AddHealthChecks(); - - // Assert - Assert.Collection(services, - actual => - { - Assert.Equal(ServiceLifetime.Singleton, actual.Lifetime); - Assert.Equal(typeof(IHealthCheckService), actual.ServiceType); - Assert.Equal(typeof(HealthCheckService), actual.ImplementationType); - Assert.Null(actual.ImplementationInstance); - Assert.Null(actual.ImplementationFactory); - }); - } - } -} diff --git a/version.props b/version.props deleted file mode 100644 index 6ecf2553b6..0000000000 --- a/version.props +++ /dev/null @@ -1,18 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - 0.4.1 - rtm - $(ExperimentalVersionPrefix) - $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final - $(ExperimentalVersionSuffix)-$(BuildNumber) - -