diff --git a/src/Umbraco.PublishedCache.NuCache/CacheKeys.cs b/src/Umbraco.PublishedCache.NuCache/CacheKeys.cs index 0b67c3a1e2..df129d7214 100644 --- a/src/Umbraco.PublishedCache.NuCache/CacheKeys.cs +++ b/src/Umbraco.PublishedCache.NuCache/CacheKeys.cs @@ -1,8 +1,7 @@ using System; -using System.Globalization; using System.Runtime.CompilerServices; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { internal static class CacheKeys { diff --git a/src/Umbraco.PublishedCache.NuCache/ContentCache.cs b/src/Umbraco.PublishedCache.NuCache/ContentCache.cs index 4fb4238e03..e4c43b1067 100644 --- a/src/Umbraco.PublishedCache.NuCache/ContentCache.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentCache.cs @@ -11,11 +11,11 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Xml; using Umbraco.Cms.Core.Xml.XPath; +using Umbraco.Cms.Infrastructure.PublishedCache.Navigable; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache.Navigable; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { internal class ContentCache : PublishedCacheBase, IPublishedContentCache, INavigableData, IDisposable { diff --git a/src/Umbraco.PublishedCache.NuCache/ContentNode.cs b/src/Umbraco.PublishedCache.NuCache/ContentNode.cs index 33b6a2e9c5..9386b7faf1 100644 --- a/src/Umbraco.PublishedCache.NuCache/ContentNode.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentNode.cs @@ -2,10 +2,10 @@ using System.Diagnostics; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache.DataSource; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { // represents a content "node" ie a pair of draft + published versions // internal, never exposed, to be accessed from ContentStore (only!) diff --git a/src/Umbraco.PublishedCache.NuCache/ContentNodeKit.cs b/src/Umbraco.PublishedCache.NuCache/ContentNodeKit.cs index 803e6ad048..c97d312c8f 100644 --- a/src/Umbraco.PublishedCache.NuCache/ContentNodeKit.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentNodeKit.cs @@ -1,8 +1,8 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Web.PublishedCache.NuCache.DataSource; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { // what's needed to actually build a content node public struct ContentNodeKit diff --git a/src/Umbraco.PublishedCache.NuCache/ContentStore.cs b/src/Umbraco.PublishedCache.NuCache/ContentStore.cs index 2989047a2e..ce7a9456e6 100644 --- a/src/Umbraco.PublishedCache.NuCache/ContentStore.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentStore.cs @@ -9,11 +9,10 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core; +using Umbraco.Cms.Infrastructure.PublishedCache.Snap; using Umbraco.Core.Scoping; -using Umbraco.Web.PublishedCache.NuCache.Snap; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { /// /// Stores content in memory and persists it back to disk diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs index 056eacd717..f0b58d0712 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs @@ -1,7 +1,7 @@ using System.IO; using CSharpTest.Net.Serialization; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { class ContentDataSerializer : ISerializer { diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentNodeKitSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentNodeKitSerializer.cs index f799869850..bb473fd34d 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentNodeKitSerializer.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentNodeKitSerializer.cs @@ -1,7 +1,7 @@ using System.IO; using CSharpTest.Net.Serialization; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { internal class ContentNodeKitSerializer : ISerializer { diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs index 883bc6899b..835fa47e34 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs @@ -4,7 +4,7 @@ using System.IO; using CSharpTest.Net.Serialization; using Umbraco.Extensions; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { internal class DictionaryOfCultureVariationSerializer : SerializerBase, ISerializer> { diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs index ac4465821e..b7c23eca04 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs @@ -4,7 +4,7 @@ using System.IO; using CSharpTest.Net.Serialization; using Umbraco.Extensions; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { internal class DictionaryOfPropertyDataSerializer : SerializerBase, ISerializer> { diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs index 79b642e52a..ace3e571d3 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs @@ -2,9 +2,8 @@ using CSharpTest.Net.Collections; using CSharpTest.Net.Serialization; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core.Configuration; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { internal class BTree { diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs index 42e7e340cd..f135ee8bb4 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { // represents everything that is specific to edited or published version public class ContentData diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs index 98d423680b..0a33ad4aee 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; using System.Collections.Generic; +using Newtonsoft.Json; using Umbraco.Core.Serialization; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { /// /// The content item 1:M data that is serialized to JSON diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs index 37fb9df8bb..2c3f8160f5 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { // read-only dto internal class ContentSourceDto diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs index b59e8c403c..fc6da41fe3 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { /// /// Represents the culture variation information on a content item diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs index 42e038c744..4320ce89bd 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using Newtonsoft.Json; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { public class PropertyData { diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/SerializerBase.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/SerializerBase.cs index ed17420645..48fadce476 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/SerializerBase.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/SerializerBase.cs @@ -2,7 +2,7 @@ using System.IO; using CSharpTest.Net.Serialization; -namespace Umbraco.Web.PublishedCache.NuCache.DataSource +namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { internal abstract class SerializerBase { diff --git a/src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs index 8fbd9ede55..4a4cba6ab8 100644 --- a/src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs @@ -4,13 +4,12 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Infrastructure.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.Persistence; using Umbraco.Core.Scoping; using Umbraco.Core.Services; -using Umbraco.Extensions; -using Umbraco.Infrastructure.PublishedCache.Persistence; -using Umbraco.Web.PublishedCache.NuCache; -namespace Umbraco.Infrastructure.PublishedCache.DependencyInjection +namespace Umbraco.Extensions { /// /// Extension methods for for the Umbraco's NuCache diff --git a/src/Umbraco.PublishedCache.NuCache/DomainCache.cs b/src/Umbraco.PublishedCache.NuCache/DomainCache.cs index bd421f0262..e957efdbcc 100644 --- a/src/Umbraco.PublishedCache.NuCache/DomainCache.cs +++ b/src/Umbraco.PublishedCache.NuCache/DomainCache.cs @@ -2,9 +2,8 @@ using System.Linq; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; -using Umbraco.Web.Routing; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { /// /// Implements for NuCache. diff --git a/src/Umbraco.PublishedCache.NuCache/MediaCache.cs b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs index 10bdeb95a4..1d422bec9a 100644 --- a/src/Umbraco.PublishedCache.NuCache/MediaCache.cs +++ b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs @@ -7,11 +7,11 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Xml; using Umbraco.Cms.Core.Xml.XPath; +using Umbraco.Cms.Infrastructure.PublishedCache.Navigable; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache.Navigable; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { public class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableData, IDisposable { diff --git a/src/Umbraco.PublishedCache.NuCache/MemberCache.cs b/src/Umbraco.PublishedCache.NuCache/MemberCache.cs index 17f24547f3..861af3a4a4 100644 --- a/src/Umbraco.PublishedCache.NuCache/MemberCache.cs +++ b/src/Umbraco.PublishedCache.NuCache/MemberCache.cs @@ -8,10 +8,11 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Xml.XPath; +using Umbraco.Cms.Infrastructure.PublishedCache.Navigable; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache.Navigable; +using Umbraco.Web.PublishedCache; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { internal class MemberCache : IPublishedMemberCache, INavigableData { diff --git a/src/Umbraco.PublishedCache.NuCache/Navigable/INavigableData.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/INavigableData.cs index 5d6a544efa..2dc238d1e4 100644 --- a/src/Umbraco.PublishedCache.NuCache/Navigable/INavigableData.cs +++ b/src/Umbraco.PublishedCache.NuCache/Navigable/INavigableData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models.PublishedContent; -namespace Umbraco.Web.PublishedCache.NuCache.Navigable +namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable { internal interface INavigableData { diff --git a/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContent.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContent.cs index 01712f312b..9d2b2bbbe5 100644 --- a/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContent.cs +++ b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContent.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Xml.XPath; -namespace Umbraco.Web.PublishedCache.NuCache.Navigable +namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable { internal class NavigableContent : INavigableContent { diff --git a/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContentType.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContentType.cs index 997d96f5f1..9062f66b92 100644 --- a/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContentType.cs +++ b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContentType.cs @@ -5,7 +5,7 @@ using System.Xml; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Xml.XPath; -namespace Umbraco.Web.PublishedCache.NuCache.Navigable +namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable { internal class NavigableContentType : INavigableContentType { diff --git a/src/Umbraco.PublishedCache.NuCache/Navigable/NavigablePropertyType.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigablePropertyType.cs index d61f90a94e..eed3d1a08d 100644 --- a/src/Umbraco.PublishedCache.NuCache/Navigable/NavigablePropertyType.cs +++ b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigablePropertyType.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Cms.Core.Xml.XPath; -namespace Umbraco.Web.PublishedCache.NuCache.Navigable +namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable { internal class NavigablePropertyType : INavigableFieldType { diff --git a/src/Umbraco.PublishedCache.NuCache/Navigable/RootContent.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/RootContent.cs index ce4736df14..68eb41a66a 100644 --- a/src/Umbraco.PublishedCache.NuCache/Navigable/RootContent.cs +++ b/src/Umbraco.PublishedCache.NuCache/Navigable/RootContent.cs @@ -2,7 +2,7 @@ using System.Linq; using Umbraco.Cms.Core.Xml.XPath; -namespace Umbraco.Web.PublishedCache.NuCache.Navigable +namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable { internal class RootContent : INavigableContent { diff --git a/src/Umbraco.PublishedCache.NuCache/Navigable/Source.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/Source.cs index 000fac5e69..ad4f1a2b13 100644 --- a/src/Umbraco.PublishedCache.NuCache/Navigable/Source.cs +++ b/src/Umbraco.PublishedCache.NuCache/Navigable/Source.cs @@ -1,7 +1,7 @@ using System.Linq; using Umbraco.Cms.Core.Xml.XPath; -namespace Umbraco.Web.PublishedCache.NuCache.Navigable +namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable { internal class Source : INavigableSource { diff --git a/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentRepository.cs b/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentRepository.cs index 11dc2006fd..ab15515d55 100644 --- a/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentRepository.cs +++ b/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentRepository.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -using Umbraco.Web.PublishedCache.NuCache; -namespace Umbraco.Infrastructure.PublishedCache.Persistence +namespace Umbraco.Cms.Infrastructure.PublishedCache.Persistence { public interface INuCacheContentRepository { diff --git a/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentService.cs b/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentService.cs index 3b87afe442..67c0bec35f 100644 --- a/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentService.cs +++ b/src/Umbraco.PublishedCache.NuCache/Persistence/INuCacheContentService.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -using Umbraco.Web.PublishedCache.NuCache; -namespace Umbraco.Infrastructure.PublishedCache.Persistence +namespace Umbraco.Cms.Infrastructure.PublishedCache.Persistence { /// /// Defines a data source for NuCache. diff --git a/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs b/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs index 499fb3a9f3..437682e0b4 100644 --- a/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs +++ b/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs @@ -10,6 +10,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories; @@ -17,12 +18,10 @@ using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache; -using Umbraco.Web.PublishedCache.NuCache.DataSource; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Infrastructure.PublishedCache.Persistence +namespace Umbraco.Cms.Infrastructure.PublishedCache.Persistence { public class NuCacheContentRepository : RepositoryBase, INuCacheContentRepository { diff --git a/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentService.cs b/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentService.cs index e9a8852e21..02774a17f5 100644 --- a/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentService.cs +++ b/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentService.cs @@ -3,15 +3,11 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Scoping; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Scoping; using Umbraco.Core.Services.Implement; -using Umbraco.Web.PublishedCache.NuCache; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Infrastructure.PublishedCache.Persistence +namespace Umbraco.Cms.Infrastructure.PublishedCache.Persistence { public class NuCacheContentService : RepositoryService, INuCacheContentService { diff --git a/src/Umbraco.PublishedCache.NuCache/Property.cs b/src/Umbraco.PublishedCache.NuCache/Property.cs index f412589691..2b5655b314 100644 --- a/src/Umbraco.PublishedCache.NuCache/Property.cs +++ b/src/Umbraco.PublishedCache.NuCache/Property.cs @@ -7,10 +7,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache.DataSource; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { [Serializable] [XmlType(Namespace = "http://umbraco.org/webservices/")] diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs b/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs index b305546678..bf34fca4e7 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs @@ -5,10 +5,10 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache.DataSource; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { internal class PublishedContent : PublishedContentBase { diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedMember.cs b/src/Umbraco.PublishedCache.NuCache/PublishedMember.cs index 8324fc6232..dfd347168a 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedMember.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedMember.cs @@ -4,10 +4,10 @@ using System.Linq; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; using Umbraco.Extensions; -using Umbraco.Web.PublishedCache.NuCache.DataSource; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { // note // the whole PublishedMember thing should be refactored because as soon as a member diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshot.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshot.cs index 93ee283aaf..6c158daf31 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshot.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshot.cs @@ -2,10 +2,8 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core; -using Umbraco.Core.Cache; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { // implements published snapshot internal class PublishedSnapshot : IPublishedSnapshot, IDisposable diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs index 5a7129aa2d..17fc0df69b 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using CSharpTest.Net.Collections; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; @@ -20,16 +19,16 @@ using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; +using Umbraco.Cms.Infrastructure.PublishedCache.Persistence; using Umbraco.Core.Scoping; using Umbraco.Extensions; -using Umbraco.Infrastructure.PublishedCache.Persistence; -using Umbraco.Web.PublishedCache.NuCache.DataSource; +using Umbraco.Web.PublishedCache; using Constants = Umbraco.Cms.Core.Constants; using File = System.IO.File; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { - internal class PublishedSnapshotService : IPublishedSnapshotService { private readonly ServiceContext _serviceContext; diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs index 7edb8a2120..e23e873c19 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs @@ -6,12 +6,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; +using Umbraco.Cms.Infrastructure.PublishedCache.Persistence; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Infrastructure.PublishedCache.Persistence; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { /// /// Subscribes to Umbraco events to ensure nucache remains consistent with the source data diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceOptions.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceOptions.cs index 5aedb4bda5..8fcb4e410d 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceOptions.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceOptions.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.PublishedCache; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { /// /// Options class for configuring the diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotStatus.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotStatus.cs index e34515d81e..df4f803006 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotStatus.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotStatus.cs @@ -1,7 +1,7 @@ using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Infrastructure.PublishedCache.Persistence; +using Umbraco.Cms.Infrastructure.PublishedCache.Persistence; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { /// /// Generates a status report for diff --git a/src/Umbraco.PublishedCache.NuCache/Snap/GenObj.cs b/src/Umbraco.PublishedCache.NuCache/Snap/GenObj.cs index b69dab7dac..a5dc6ae06b 100644 --- a/src/Umbraco.PublishedCache.NuCache/Snap/GenObj.cs +++ b/src/Umbraco.PublishedCache.NuCache/Snap/GenObj.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace Umbraco.Web.PublishedCache.NuCache.Snap +namespace Umbraco.Cms.Infrastructure.PublishedCache.Snap { internal class GenObj { diff --git a/src/Umbraco.PublishedCache.NuCache/Snap/GenRef.cs b/src/Umbraco.PublishedCache.NuCache/Snap/GenRef.cs index ade0251b8d..7bf0fc8574 100644 --- a/src/Umbraco.PublishedCache.NuCache/Snap/GenRef.cs +++ b/src/Umbraco.PublishedCache.NuCache/Snap/GenRef.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.PublishedCache.NuCache.Snap +namespace Umbraco.Cms.Infrastructure.PublishedCache.Snap { internal class GenRef { diff --git a/src/Umbraco.PublishedCache.NuCache/Snap/LinkedNode.cs b/src/Umbraco.PublishedCache.NuCache/Snap/LinkedNode.cs index 94f83ac4e5..df82b47e94 100644 --- a/src/Umbraco.PublishedCache.NuCache/Snap/LinkedNode.cs +++ b/src/Umbraco.PublishedCache.NuCache/Snap/LinkedNode.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.PublishedCache.NuCache.Snap +namespace Umbraco.Cms.Infrastructure.PublishedCache.Snap { //NOTE: This cannot be struct because it references itself diff --git a/src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs b/src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs index 742478e165..4580183239 100644 --- a/src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs +++ b/src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Umbraco.Cms.Core.Exceptions; +using Umbraco.Cms.Infrastructure.PublishedCache.Snap; using Umbraco.Core.Scoping; -using Umbraco.Web.PublishedCache.NuCache.Snap; -namespace Umbraco.Web.PublishedCache.NuCache +namespace Umbraco.Cms.Infrastructure.PublishedCache { internal class SnapDictionary where TValue : class diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index 9f63604b0e..9c40e8c2d0 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -2,7 +2,7 @@ netstandard2.0 - Umbraco.Infrastructure.PublishedCache + Umbraco.Cms.Infrastructure.PublishedCache 8 diff --git a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs b/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs index 5264f6fe7a..03dbcca14d 100644 --- a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs +++ b/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs @@ -15,7 +15,6 @@ using Umbraco.Cms.Core.Services; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Extensions; -using Umbraco.Infrastructure.PublishedCache.DependencyInjection; using Umbraco.Tests.Integration.Extensions; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.Integration.Testing; diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index a175c6c88d..2ed7d56cab 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -18,13 +18,13 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.WebAssets; using Umbraco.Cms.Examine; +using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Core.Services.Implement; using Umbraco.Examine; using Umbraco.Extensions; using Umbraco.Infrastructure.HostedServices; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.TestHelpers.Stubs; -using Umbraco.Web.PublishedCache.NuCache; using Umbraco.Web.Search; namespace Umbraco.Tests.Integration.DependencyInjection diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs index b54fdb106f..acbb96eb7a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs @@ -11,13 +11,13 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web.PublishedCache.NuCache; namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services { diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs index 8b8df1c624..67d5f21975 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs @@ -15,6 +15,7 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; @@ -23,7 +24,6 @@ using Umbraco.Tests.Common; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web.PublishedCache.NuCache; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs index 9f9e01e125..b3ad532d0a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs @@ -6,7 +6,6 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -using Umbraco.Infrastructure.PublishedCache.DependencyInjection; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs index 8f42f0c42b..4226b767aa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs @@ -6,8 +6,8 @@ using System.Linq; using System.Threading.Tasks; using Moq; using NUnit.Framework; +using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Core.Scoping; -using Umbraco.Web.PublishedCache.NuCache; namespace Umbraco.Tests.UnitTests.Umbraco.Umbraco.PublishedCache { @@ -395,7 +395,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Umbraco.PublishedCache // collect liveGen GC.Collect(); - Assert.IsTrue(d.Test.GenObjs.TryPeek(out global::Umbraco.Web.PublishedCache.NuCache.Snap.GenObj genObj)); + Assert.IsTrue(d.Test.GenObjs.TryPeek(out global::Umbraco.Cms.Infrastructure.PublishedCache.Snap.GenObj genObj)); genObj = null; // in Release mode, it works, but in Debug mode, the weak reference is still alive diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs index 547f4902ab..530dd89c03 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs @@ -20,6 +20,8 @@ using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Infrastructure.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Extensions; @@ -27,8 +29,6 @@ using Umbraco.Tests.Common; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing.Objects; using Umbraco.Web.Composing; -using Umbraco.Web.PublishedCache.NuCache; -using Umbraco.Web.PublishedCache.NuCache.DataSource; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs index 8da3a270ad..2516000523 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs @@ -18,6 +18,8 @@ using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Infrastructure.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.DataSource; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Extensions; @@ -25,8 +27,6 @@ using Umbraco.Tests.Common; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing.Objects; using Umbraco.Web.Composing; -using Umbraco.Web.PublishedCache.NuCache; -using Umbraco.Web.PublishedCache.NuCache.DataSource; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs index 75cff6e5f3..a79811f799 100644 --- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs @@ -19,17 +19,17 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Infrastructure.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.Persistence; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Infrastructure.PublishedCache.Persistence; using Umbraco.Tests.Common; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using Umbraco.Web; using Umbraco.Web.Cache; using Umbraco.Web.Composing; -using Umbraco.Web.PublishedCache.NuCache; namespace Umbraco.Tests.Scoping { diff --git a/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs b/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs index 8ead41592f..9a5b5d343c 100644 --- a/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs +++ b/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Infrastructure.PublishedCache; +using Umbraco.Cms.Infrastructure.PublishedCache.Persistence; using Umbraco.Core.Models; using Umbraco.Core.Scoping; -using Umbraco.Infrastructure.PublishedCache.Persistence; using Umbraco.Web; -using Umbraco.Web.PublishedCache.NuCache; namespace Umbraco.Tests.Testing.Objects { diff --git a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs index c7082e024b..108029e9c8 100644 --- a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs @@ -31,19 +31,13 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Events; -using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.Security; using Umbraco.Extensions; using Umbraco.Infrastructure.DependencyInjection; using Umbraco.Infrastructure.HostedServices; using Umbraco.Infrastructure.HostedServices.ServerRegistration; -using Umbraco.Infrastructure.PublishedCache.DependencyInjection; using Umbraco.Web.Common.ApplicationModels; using Umbraco.Web.Common.AspNetCore; using Umbraco.Web.Common.Controllers; diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs index 7084cf64d5..fc309bb332 100644 --- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs @@ -11,13 +11,13 @@ using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Extensions; using Umbraco.Web.Common.Profiler; -using Umbraco.Web.PublishedCache.NuCache; namespace Umbraco.Web.Common.Middleware {