From 07d04dafb88af043d4fedafc5cf463aecff49c2f Mon Sep 17 00:00:00 2001 From: Mole Date: Fri, 12 Feb 2021 11:38:50 +0100 Subject: [PATCH] Align namespaces in Logging to Umbraco.Cms.Core I'm a bit uncertain about this, they do have a reference to Serilog, but the vast majority of logging already resides in Core, so I opted to move it to Umbraco.Cms.Core --- .../Logging/LogHttpRequestExtension.cs} | 2 +- .../DependencyInjection/UmbracoBuilder.CoreServices.cs | 3 +-- .../DependencyInjection/UmbracoBuilder.Uniques.cs | 2 +- src/Umbraco.Infrastructure/Logging/MessageTemplates.cs | 4 +--- .../Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs | 3 ++- .../Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs | 2 +- .../Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs | 2 +- .../Logging/Serilog/Enrichers/Log4NetLevelMapperEnricher.cs | 2 +- .../Serilog/Enrichers/ThreadAbortExceptionEnricher.cs | 2 +- .../Logging/Serilog/LoggerConfigExtensions.cs | 5 ++--- src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs | 5 +---- src/Umbraco.Infrastructure/Logging/Viewer/CountingFilter.cs | 2 +- .../Logging/Viewer/ErrorCounterFilter.cs | 2 +- .../Logging/Viewer/ExpressionFilter.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/ILogFilter.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs | 4 +--- .../Logging/Viewer/ILogViewerConfig.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/LogLevelCounts.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/LogMessage.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/LogTemplate.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/LogTimePeriod.cs | 2 +- .../Logging/Viewer/LogViewerComposer.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs | 2 +- .../Logging/Viewer/MessageTemplateFilter.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/SavedLogSearch.cs | 2 +- .../Logging/Viewer/SerilogJsonLogViewer.cs | 2 +- .../Logging/Viewer/SerilogLogViewerSourceBase.cs | 3 +-- .../Persistence/FaultHandling/RetryPolicy.cs | 1 - .../ValueConverters/NestedContentManyValueConverter.cs | 4 ---- .../ValueConverters/NestedContentSingleValueConverter.cs | 3 --- .../Umbraco.Infrastructure/Logging/LogviewerTests.cs | 2 +- .../Controllers/LogViewerController.cs | 2 +- .../Extensions/ApplicationBuilderExtensions.cs | 2 +- .../Extensions/UmbracoCoreServiceCollectionExtensions.cs | 2 +- .../Middleware/UmbracoRequestLoggingMiddleware.cs | 2 +- .../Middleware/UmbracoRequestMiddleware.cs | 1 - src/Umbraco.Web/UmbracoApplication.cs | 2 +- src/Umbraco.Web/UmbracoApplicationBase.cs | 4 ++-- src/Umbraco.Web/UmbracoHttpHandler.cs | 3 --- src/Umbraco.Web/UmbracoWebService.cs | 3 --- 40 files changed, 37 insertions(+), 61 deletions(-) rename src/{Umbraco.Infrastructure/Logging/LogHttpRequest.cs => Umbraco.Core/Logging/LogHttpRequestExtension.cs} (96%) diff --git a/src/Umbraco.Infrastructure/Logging/LogHttpRequest.cs b/src/Umbraco.Core/Logging/LogHttpRequestExtension.cs similarity index 96% rename from src/Umbraco.Infrastructure/Logging/LogHttpRequest.cs rename to src/Umbraco.Core/Logging/LogHttpRequestExtension.cs index c4b62b4194..d6d5af9802 100644 --- a/src/Umbraco.Infrastructure/Logging/LogHttpRequest.cs +++ b/src/Umbraco.Core/Logging/LogHttpRequestExtension.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Cms.Core.Cache; -namespace Umbraco.Core.Logging +namespace Umbraco.Extensions { public static class LogHttpRequest { diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs index 7f475e1c5e..2c4954d385 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs @@ -10,6 +10,7 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.HealthChecks.NotificationMethods; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Install; +using Umbraco.Cms.Core.Logging.Serilog.Enrichers; using Umbraco.Cms.Core.Mail; using Umbraco.Cms.Core.Manifest; using Umbraco.Cms.Core.Media; @@ -29,7 +30,6 @@ using Umbraco.Cms.Infrastructure.HealthChecks; using Umbraco.Cms.Infrastructure.HostedServices; using Umbraco.Cms.Infrastructure.Install; using Umbraco.Core; -using Umbraco.Core.Logging.Serilog.Enrichers; using Umbraco.Core.Manifest; using Umbraco.Core.Migrations; using Umbraco.Core.Migrations.Install; @@ -40,7 +40,6 @@ using Umbraco.Core.Runtime; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Extensions; -using Umbraco.Infrastructure.Logging.Serilog.Enrichers; using Umbraco.Infrastructure.Media; using Umbraco.Infrastructure.Runtime; using Umbraco.Web; diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs index ddbf4ceca1..5a6c8fe8f2 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs @@ -3,9 +3,9 @@ using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Dictionary; using Umbraco.Cms.Core.IO; +using Umbraco.Cms.Core.Logging.Viewer; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Logging.Viewer; using Umbraco.Extensions; namespace Umbraco.Cms.Infrastructure.DependencyInjection diff --git a/src/Umbraco.Infrastructure/Logging/MessageTemplates.cs b/src/Umbraco.Infrastructure/Logging/MessageTemplates.cs index 3ec8fd19ed..fdb5960622 100644 --- a/src/Umbraco.Infrastructure/Logging/MessageTemplates.cs +++ b/src/Umbraco.Infrastructure/Logging/MessageTemplates.cs @@ -1,13 +1,11 @@ using System; using System.IO; using System.Linq; -using System.Text; using Serilog; using Serilog.Events; using Serilog.Parsing; -using Umbraco.Cms.Core.Logging; -namespace Umbraco.Core.Logging +namespace Umbraco.Cms.Core.Logging { public class MessageTemplates : IMessageTemplates { diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs index 7a6991680c..cddd98bb13 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs @@ -2,8 +2,9 @@ using Serilog.Core; using Serilog.Events; using Umbraco.Cms.Core.Cache; +using Umbraco.Extensions; -namespace Umbraco.Core.Logging.Serilog.Enrichers +namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers { /// /// Enrich log events with a HttpRequestId GUID. diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs index 6f6079aec4..57e31ebec9 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs @@ -4,7 +4,7 @@ using Serilog.Core; using Serilog.Events; using Umbraco.Cms.Core.Cache; -namespace Umbraco.Core.Logging.Serilog.Enrichers +namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers { /// /// Enrich log events with a HttpRequestNumber unique within the current diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs index bffad37db2..7f85873c61 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs @@ -3,7 +3,7 @@ using Serilog.Events; using System; using Umbraco.Cms.Core.Net; -namespace Umbraco.Core.Logging.Serilog.Enrichers +namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers { /// /// Enrich log events with the HttpSessionId property. diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/Log4NetLevelMapperEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/Log4NetLevelMapperEnricher.cs index 0c255fa8b4..2cf782c5bf 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/Log4NetLevelMapperEnricher.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/Log4NetLevelMapperEnricher.cs @@ -1,7 +1,7 @@ using Serilog.Core; using Serilog.Events; -namespace Umbraco.Core.Logging.Serilog.Enrichers +namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers { /// /// This is used to create a new property in Logs called 'Log4NetLevel' diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs index 741df46969..9ea3d0009d 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Diagnostics; using Umbraco.Cms.Core.Hosting; using CoreDebugSettings = Umbraco.Cms.Core.Configuration.Models.CoreDebugSettings; -namespace Umbraco.Infrastructure.Logging.Serilog.Enrichers +namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers { /// /// Enriches the log if there are ThreadAbort exceptions and will automatically create a minidump if it can diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs index 3b1f39b77a..d0b1556dbb 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs @@ -8,11 +8,10 @@ using Serilog.Events; using Serilog.Formatting; using Serilog.Formatting.Compact; using Umbraco.Cms.Core.Hosting; -using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Logging.Serilog.Enrichers; +using Umbraco.Cms.Core.Logging.Serilog.Enrichers; using Umbraco.Extensions; -namespace Umbraco.Core.Logging.Serilog +namespace Umbraco.Cms.Core.Logging.Serilog { public static class LoggerConfigExtensions { diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs index c71096e688..26a87a3dff 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs @@ -4,13 +4,10 @@ using Microsoft.Extensions.Configuration; using Serilog; using Serilog.Events; using Umbraco.Cms.Core.Hosting; -using Umbraco.Cms.Core.Logging; using Umbraco.Extensions; -using LogLevel = Umbraco.Cms.Core.Logging.LogLevel; -namespace Umbraco.Core.Logging.Serilog +namespace Umbraco.Cms.Core.Logging.Serilog { - /// /// Implements on top of Serilog. /// diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/CountingFilter.cs b/src/Umbraco.Infrastructure/Logging/Viewer/CountingFilter.cs index bce0e0e9f8..36d12dee0d 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/CountingFilter.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/CountingFilter.cs @@ -1,7 +1,7 @@ using System; using Serilog.Events; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { internal class CountingFilter : ILogFilter { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ErrorCounterFilter.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ErrorCounterFilter.cs index 63f85b1087..1a4ececff6 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ErrorCounterFilter.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ErrorCounterFilter.cs @@ -1,6 +1,6 @@ using Serilog.Events; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { internal class ErrorCounterFilter : ILogFilter { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs index 9c1bff436a..7327262ec5 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs @@ -4,7 +4,7 @@ using Serilog.Events; using Serilog.Filters.Expressions; using Umbraco.Extensions; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { //Log Expression Filters (pass in filter exp string) internal class ExpressionFilter : ILogFilter diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ILogFilter.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ILogFilter.cs index 3e1deb4923..4619df2b13 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ILogFilter.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ILogFilter.cs @@ -1,6 +1,6 @@ using Serilog.Events; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public interface ILogFilter { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs index 021b1f137d..2cb6123469 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public interface ILogViewer { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs index 14f35361e6..54ade21b48 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public interface ILogViewerConfig { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogLevelCounts.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogLevelCounts.cs index 4d2e39f6e2..f397c1ab7c 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogLevelCounts.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogLevelCounts.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public class LogLevelCounts { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogMessage.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogMessage.cs index c9310ad200..e55f1605fb 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogMessage.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogMessage.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; // ReSharper disable UnusedAutoPropertyAccessor.Global -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public class LogMessage { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogTemplate.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogTemplate.cs index dd960a9e81..3398e32fd0 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogTemplate.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogTemplate.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public class LogTemplate { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogTimePeriod.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogTimePeriod.cs index 0f41faef0a..446f7bf160 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogTimePeriod.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogTimePeriod.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public class LogTimePeriod { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs index 7cc4dd1077..dcfcb66d5d 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Infrastructure.DependencyInjection; using Umbraco.Extensions; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { // ReSharper disable once UnusedMember.Global public class LogViewerComposer : ICoreComposer diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs index da964bbc35..13b295f4bc 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs @@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Routing; using Formatting = Newtonsoft.Json.Formatting; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public class LogViewerConfig : ILogViewerConfig { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/MessageTemplateFilter.cs b/src/Umbraco.Infrastructure/Logging/Viewer/MessageTemplateFilter.cs index 4a724d9147..1b89716256 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/MessageTemplateFilter.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/MessageTemplateFilter.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Serilog.Events; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { internal class MessageTemplateFilter : ILogFilter { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/SavedLogSearch.cs b/src/Umbraco.Infrastructure/Logging/Viewer/SavedLogSearch.cs index ef2181e3bf..b01dad251d 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/SavedLogSearch.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/SavedLogSearch.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public class SavedLogSearch { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs index ae4b90d7bb..7599ab0a16 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs @@ -8,7 +8,7 @@ using Serilog.Events; using Serilog.Formatting.Compact.Reader; using Umbraco.Cms.Core.Logging; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { internal class SerilogJsonLogViewer : SerilogLogViewerSourceBase { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs index b556ede79e..ce897de0cd 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs @@ -2,11 +2,10 @@ using System.Collections.Generic; using System.Linq; using Serilog.Events; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Extensions; -namespace Umbraco.Core.Logging.Viewer +namespace Umbraco.Cms.Core.Logging.Viewer { public abstract class SerilogLogViewerSourceBase : ILogViewer { diff --git a/src/Umbraco.Infrastructure/Persistence/FaultHandling/RetryPolicy.cs b/src/Umbraco.Infrastructure/Persistence/FaultHandling/RetryPolicy.cs index 58bada0516..d9255098b8 100644 --- a/src/Umbraco.Infrastructure/Persistence/FaultHandling/RetryPolicy.cs +++ b/src/Umbraco.Infrastructure/Persistence/FaultHandling/RetryPolicy.cs @@ -1,6 +1,5 @@ using System; using System.Threading; -using Umbraco.Core.Logging; using Umbraco.Core.Persistence.FaultHandling.Strategies; namespace Umbraco.Core.Persistence.FaultHandling diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs index 71573fa651..a815fdf5b6 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs @@ -1,16 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core.Logging; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; -using Umbraco.Web.PublishedCache; namespace Umbraco.Web.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs index 16f9f4f9a9..d7279f08d9 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs @@ -6,10 +6,7 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core.Logging; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; -using Umbraco.Web.PublishedCache; namespace Umbraco.Web.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs index 377c24b3e0..a957f3611e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs @@ -14,9 +14,9 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; +using Umbraco.Cms.Core.Logging.Viewer; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.UnitTests.TestHelpers; -using Umbraco.Core.Logging.Viewer; using File = System.IO.File; namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Logging diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs index d3fd41d663..20d33bd83a 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.Logging.Viewer; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Web.Common.ActionsResults; using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Cms.Web.Common.Authorization; -using Umbraco.Core.Logging.Viewer; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs index 75a5f95f21..42b9b64ff4 100644 --- a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs @@ -11,10 +11,10 @@ using StackExchange.Profiling; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Cms.Core.Logging.Serilog.Enrichers; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.Common.Middleware; using Umbraco.Cms.Web.Common.Plugins; -using Umbraco.Infrastructure.Logging.Serilog.Enrichers; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs index f2375dd764..61d6212ce5 100644 --- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs @@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Logging.Serilog; +using Umbraco.Cms.Core.Logging.Serilog; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; namespace Umbraco.Extensions diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs index 57c50d4f46..80e67c5857 100644 --- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Serilog.Context; -using Umbraco.Core.Logging.Serilog.Enrichers; +using Umbraco.Cms.Core.Logging.Serilog.Enrichers; using Umbraco.Extensions; namespace Umbraco.Cms.Web.Common.Middleware diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs index 74651d8087..6fdd41a757 100644 --- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs @@ -13,7 +13,6 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Cms.Web.Common.Profiler; -using Umbraco.Core.Logging; using Umbraco.Extensions; namespace Umbraco.Cms.Web.Common.Middleware diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs index ae4a6ae811..304674d909 100644 --- a/src/Umbraco.Web/UmbracoApplication.cs +++ b/src/Umbraco.Web/UmbracoApplication.cs @@ -1,8 +1,8 @@ using System.Runtime.InteropServices; using System.Web; using Microsoft.Extensions.Logging; +using Umbraco.Cms.Core.Logging; using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Runtime; using Umbraco.Web.Runtime; using ConnectionStrings = Umbraco.Cms.Core.Configuration.Models.ConnectionStrings; diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs index 10a8894a15..6d6d4a219b 100644 --- a/src/Umbraco.Web/UmbracoApplicationBase.cs +++ b/src/Umbraco.Web/UmbracoApplicationBase.cs @@ -18,10 +18,10 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; +using Umbraco.Cms.Core.Logging.Serilog; +using Umbraco.Cms.Core.Logging.Serilog.Enrichers; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Logging.Serilog; -using Umbraco.Core.Logging.Serilog.Enrichers; using Umbraco.Extensions; using Umbraco.Web.Hosting; using ConnectionStrings = Umbraco.Cms.Core.Configuration.Models.ConnectionStrings; diff --git a/src/Umbraco.Web/UmbracoHttpHandler.cs b/src/Umbraco.Web/UmbracoHttpHandler.cs index b1ad230e66..db7227fc32 100644 --- a/src/Umbraco.Web/UmbracoHttpHandler.cs +++ b/src/Umbraco.Web/UmbracoHttpHandler.cs @@ -5,9 +5,6 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core.Logging; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Web.Composing; namespace Umbraco.Web diff --git a/src/Umbraco.Web/UmbracoWebService.cs b/src/Umbraco.Web/UmbracoWebService.cs index 98e9b24379..9376ae2a41 100644 --- a/src/Umbraco.Web/UmbracoWebService.cs +++ b/src/Umbraco.Web/UmbracoWebService.cs @@ -6,9 +6,6 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core.Logging; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Web.Composing; namespace Umbraco.Web