From d147b182ee5e791bc453aaf2ee8421bdf5e7d8b7 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 6 Feb 2020 14:40:46 +0100 Subject: [PATCH] Renamed the project to Umbraco.PublishedCache.NuCache - and move non NuCache related stuff to abstractions and infrastructure. --- .../Composing}/CompositionExtensions.cs | 0 .../PublishedCache}/PublishedCacheBase.cs | 2 +- .../PublishedCache}/PublishedMember.cs | 0 .../PublishedCache}/PublishedSnapshotServiceBase.cs | 2 +- .../PublishedCache}/PublishedContentTypeCache.cs | 2 +- .../CacheKeys.cs | 0 .../ContentCache.cs | 0 .../ContentNode.cs | 4 ++-- .../ContentNodeKit.cs | 2 +- .../ContentStore.cs | 2 +- .../DataSource/BTree.ContentDataSerializer.cs | 0 .../DataSource/BTree.ContentNodeKitSerializer.cs | 0 .../BTree.DictionaryOfCultureVariationSerializer.cs | 0 .../BTree.DictionaryOfPropertyDataSerializer.cs | 0 .../DataSource/BTree.cs | 0 .../DataSource/ContentData.cs | 2 +- .../DataSource/ContentNestedData.cs | 0 .../DataSource/ContentSourceDto.cs | 0 .../DataSource/CultureVariation.cs | 2 +- .../DataSource/DatabaseDataSource.cs | 0 .../DataSource/IDataSource.cs | 0 .../DataSource/PropertyData.cs | 2 +- .../DataSource/SerializerBase.cs | 0 .../DomainCache.cs | 0 .../MediaCache.cs | 2 +- .../MemberCache.cs | 0 .../Navigable/INavigableData.cs | 0 .../Navigable/NavigableContent.cs | 0 .../Navigable/NavigableContentType.cs | 0 .../Navigable/NavigablePropertyType.cs | 0 .../Navigable/RootContent.cs | 0 .../Navigable/Source.cs | 0 .../NuCacheComponent.cs | 0 .../NuCacheComposer.cs | 0 .../Property.cs | 0 .../PublishedContent.cs | 0 .../PublishedMember.cs | 0 .../PublishedSnapshot.cs | 0 .../PublishedSnapshotService.cs | 0 .../PublishedSnapshotServiceOptions.cs | 0 .../Snap/GenObj.cs | 0 .../Snap/GenRef.cs | 0 .../Snap/LinkedNode.cs | 0 .../SnapDictionary.cs | 0 .../Umbraco.PublishedCache.NuCache.csproj} | 1 + .../readme.md | 0 src/Umbraco.Tests/Cache/SnapDictionaryTests.cs | 13 ++++++------- src/Umbraco.Tests/Umbraco.Tests.csproj | 9 +++++---- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 ++++---- src/umbraco.sln | 2 +- 50 files changed, 28 insertions(+), 27 deletions(-) rename src/{Umbraco.Infrastructure.PublishedCache => Umbraco.Abstractions/Composing}/CompositionExtensions.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache => Umbraco.Abstractions/PublishedCache}/PublishedCacheBase.cs (98%) rename src/{Umbraco.Infrastructure.PublishedCache => Umbraco.Abstractions/PublishedCache}/PublishedMember.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache => Umbraco.Abstractions/PublishedCache}/PublishedSnapshotServiceBase.cs (96%) rename src/{Umbraco.Infrastructure.PublishedCache => Umbraco.Infrastructure/PublishedCache}/PublishedContentTypeCache.cs (98%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/CacheKeys.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/ContentCache.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/ContentNode.cs (99%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/ContentNodeKit.cs (98%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/ContentStore.cs (99%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/BTree.ContentDataSerializer.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/BTree.ContentNodeKitSerializer.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/BTree.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/ContentData.cs (96%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/ContentNestedData.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/ContentSourceDto.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/CultureVariation.cs (93%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/DatabaseDataSource.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/IDataSource.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/PropertyData.cs (95%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DataSource/SerializerBase.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/DomainCache.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/MediaCache.cs (98%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/MemberCache.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Navigable/INavigableData.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Navigable/NavigableContent.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Navigable/NavigableContentType.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Navigable/NavigablePropertyType.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Navigable/RootContent.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Navigable/Source.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/NuCacheComponent.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/NuCacheComposer.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Property.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/PublishedContent.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/PublishedMember.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/PublishedSnapshot.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/PublishedSnapshotService.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/PublishedSnapshotServiceOptions.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Snap/GenObj.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Snap/GenRef.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/Snap/LinkedNode.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/SnapDictionary.cs (100%) rename src/{Umbraco.Infrastructure.PublishedCache/Umbraco.Infrastructure.PublishedCache.csproj => Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj} (93%) rename src/{Umbraco.Infrastructure.PublishedCache/NuCache => Umbraco.PublishedCache.NuCache}/readme.md (100%) diff --git a/src/Umbraco.Infrastructure.PublishedCache/CompositionExtensions.cs b/src/Umbraco.Abstractions/Composing/CompositionExtensions.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/CompositionExtensions.cs rename to src/Umbraco.Abstractions/Composing/CompositionExtensions.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/PublishedCacheBase.cs b/src/Umbraco.Abstractions/PublishedCache/PublishedCacheBase.cs similarity index 98% rename from src/Umbraco.Infrastructure.PublishedCache/PublishedCacheBase.cs rename to src/Umbraco.Abstractions/PublishedCache/PublishedCacheBase.cs index 28bc218f54..56fbf6e553 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/PublishedCacheBase.cs +++ b/src/Umbraco.Abstractions/PublishedCache/PublishedCacheBase.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Xml; namespace Umbraco.Web.PublishedCache { - abstract class PublishedCacheBase : IPublishedCache + public abstract class PublishedCacheBase : IPublishedCache { private readonly IVariationContextAccessor _variationContextAccessor; diff --git a/src/Umbraco.Infrastructure.PublishedCache/PublishedMember.cs b/src/Umbraco.Abstractions/PublishedCache/PublishedMember.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/PublishedMember.cs rename to src/Umbraco.Abstractions/PublishedCache/PublishedMember.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/PublishedSnapshotServiceBase.cs b/src/Umbraco.Abstractions/PublishedCache/PublishedSnapshotServiceBase.cs similarity index 96% rename from src/Umbraco.Infrastructure.PublishedCache/PublishedSnapshotServiceBase.cs rename to src/Umbraco.Abstractions/PublishedCache/PublishedSnapshotServiceBase.cs index 5c30bb8410..cb3ca269f4 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/PublishedSnapshotServiceBase.cs +++ b/src/Umbraco.Abstractions/PublishedCache/PublishedSnapshotServiceBase.cs @@ -5,7 +5,7 @@ using Umbraco.Web.Cache; namespace Umbraco.Web.PublishedCache { - abstract class PublishedSnapshotServiceBase : IPublishedSnapshotService + public abstract class PublishedSnapshotServiceBase : IPublishedSnapshotService { protected PublishedSnapshotServiceBase(IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor) { diff --git a/src/Umbraco.Infrastructure.PublishedCache/PublishedContentTypeCache.cs b/src/Umbraco.Infrastructure/PublishedCache/PublishedContentTypeCache.cs similarity index 98% rename from src/Umbraco.Infrastructure.PublishedCache/PublishedContentTypeCache.cs rename to src/Umbraco.Infrastructure/PublishedCache/PublishedContentTypeCache.cs index e453471bb8..ba4f76dca6 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/PublishedContentTypeCache.cs +++ b/src/Umbraco.Infrastructure/PublishedCache/PublishedContentTypeCache.cs @@ -25,7 +25,7 @@ namespace Umbraco.Web.PublishedCache private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim(); // default ctor - internal PublishedContentTypeCache(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, IPublishedContentTypeFactory publishedContentTypeFactory, ILogger logger) + public PublishedContentTypeCache(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, IPublishedContentTypeFactory publishedContentTypeFactory, ILogger logger) { _contentTypeService = contentTypeService; _mediaTypeService = mediaTypeService; diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/CacheKeys.cs b/src/Umbraco.PublishedCache.NuCache/CacheKeys.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/CacheKeys.cs rename to src/Umbraco.PublishedCache.NuCache/CacheKeys.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.PublishedCache.NuCache/ContentCache.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentCache.cs rename to src/Umbraco.PublishedCache.NuCache/ContentCache.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.PublishedCache.NuCache/ContentNode.cs similarity index 99% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentNode.cs rename to src/Umbraco.PublishedCache.NuCache/ContentNode.cs index 43c8e89d2e..38ba78caae 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentNode.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentNode.cs @@ -8,7 +8,7 @@ namespace Umbraco.Web.PublishedCache.NuCache // represents a content "node" ie a pair of draft + published versions // internal, never exposed, to be accessed from ContentStore (only!) [DebuggerDisplay("Id: {Id}, Path: {Path}")] - internal class ContentNode + public class ContentNode { // special ctor for root pseudo node public ContentNode() @@ -113,7 +113,7 @@ namespace Umbraco.Web.PublishedCache.NuCache // everything that is common to both draft and published versions // keep this as small as possible - + public readonly int Id; public readonly Guid Uid; public IPublishedContentType ContentType; diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentNodeKit.cs b/src/Umbraco.PublishedCache.NuCache/ContentNodeKit.cs similarity index 98% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentNodeKit.cs rename to src/Umbraco.PublishedCache.NuCache/ContentNodeKit.cs index 842ca19388..8e24afd620 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentNodeKit.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentNodeKit.cs @@ -4,7 +4,7 @@ using Umbraco.Web.PublishedCache.NuCache.DataSource; namespace Umbraco.Web.PublishedCache.NuCache { // what's needed to actually build a content node - internal struct ContentNodeKit + public struct ContentNodeKit { public ContentNode Node; public int ContentTypeId; diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.PublishedCache.NuCache/ContentStore.cs similarity index 99% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentStore.cs rename to src/Umbraco.PublishedCache.NuCache/ContentStore.cs index e84586f415..2927bd6cc0 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/ContentStore.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentStore.cs @@ -26,7 +26,7 @@ namespace Umbraco.Web.PublishedCache.NuCache /// This class's logic is based on the class but has been slightly modified to suit these purposes. /// /// - internal class ContentStore + public class ContentStore { // this class is an extended version of SnapDictionary // most of the snapshots management code, etc is an exact copy diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.ContentDataSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.ContentDataSerializer.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentNodeKitSerializer.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentNodeKitSerializer.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/BTree.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/ContentData.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs similarity index 96% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/ContentData.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs index 36586acd12..42e7e340cd 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/ContentData.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Umbraco.Web.PublishedCache.NuCache.DataSource { // represents everything that is specific to edited or published version - internal class ContentData + public class ContentData { public string Name { get; set; } public string UrlSegment { get; set; } diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/ContentNestedData.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/ContentNestedData.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/ContentSourceDto.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/ContentSourceDto.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/CultureVariation.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs similarity index 93% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/CultureVariation.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs index a98a96f424..2521d42744 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/CultureVariation.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs @@ -6,7 +6,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource /// /// Represents the culture variation information on a content item /// - internal class CultureVariation + public class CultureVariation { [JsonProperty("name")] public string Name { get; set; } diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/DatabaseDataSource.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/DatabaseDataSource.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/DatabaseDataSource.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/IDataSource.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/IDataSource.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/IDataSource.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/IDataSource.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/PropertyData.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs similarity index 95% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/PropertyData.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs index e14426a2e2..9ab9401d71 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/PropertyData.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; namespace Umbraco.Web.PublishedCache.NuCache.DataSource { - internal class PropertyData + public class PropertyData { private string _culture; private string _segment; diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/SerializerBase.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/SerializerBase.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DataSource/SerializerBase.cs rename to src/Umbraco.PublishedCache.NuCache/DataSource/SerializerBase.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/DomainCache.cs b/src/Umbraco.PublishedCache.NuCache/DomainCache.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/DomainCache.cs rename to src/Umbraco.PublishedCache.NuCache/DomainCache.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/MediaCache.cs b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs similarity index 98% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/MediaCache.cs rename to src/Umbraco.PublishedCache.NuCache/MediaCache.cs index 182086ed7f..376e1d2e48 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/MediaCache.cs +++ b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs @@ -11,7 +11,7 @@ using Umbraco.Web.PublishedCache.NuCache.Navigable; namespace Umbraco.Web.PublishedCache.NuCache { - internal class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableData, IDisposable + public class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableData, IDisposable { private readonly ContentStore.Snapshot _snapshot; private readonly IVariationContextAccessor _variationContextAccessor; diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/MemberCache.cs b/src/Umbraco.PublishedCache.NuCache/MemberCache.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/MemberCache.cs rename to src/Umbraco.PublishedCache.NuCache/MemberCache.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/INavigableData.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/INavigableData.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/INavigableData.cs rename to src/Umbraco.PublishedCache.NuCache/Navigable/INavigableData.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/NavigableContent.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContent.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/NavigableContent.cs rename to src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContent.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/NavigableContentType.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContentType.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/NavigableContentType.cs rename to src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContentType.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/NavigablePropertyType.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/NavigablePropertyType.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/NavigablePropertyType.cs rename to src/Umbraco.PublishedCache.NuCache/Navigable/NavigablePropertyType.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/RootContent.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/RootContent.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/RootContent.cs rename to src/Umbraco.PublishedCache.NuCache/Navigable/RootContent.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/Source.cs b/src/Umbraco.PublishedCache.NuCache/Navigable/Source.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Navigable/Source.cs rename to src/Umbraco.PublishedCache.NuCache/Navigable/Source.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComponent.cs b/src/Umbraco.PublishedCache.NuCache/NuCacheComponent.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComponent.cs rename to src/Umbraco.PublishedCache.NuCache/NuCacheComponent.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComposer.cs b/src/Umbraco.PublishedCache.NuCache/NuCacheComposer.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComposer.cs rename to src/Umbraco.PublishedCache.NuCache/NuCacheComposer.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Property.cs b/src/Umbraco.PublishedCache.NuCache/Property.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Property.cs rename to src/Umbraco.PublishedCache.NuCache/Property.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedContent.cs rename to src/Umbraco.PublishedCache.NuCache/PublishedContent.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedMember.cs b/src/Umbraco.PublishedCache.NuCache/PublishedMember.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedMember.cs rename to src/Umbraco.PublishedCache.NuCache/PublishedMember.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedSnapshot.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshot.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedSnapshot.cs rename to src/Umbraco.PublishedCache.NuCache/PublishedSnapshot.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedSnapshotService.cs rename to src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedSnapshotServiceOptions.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceOptions.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/PublishedSnapshotServiceOptions.cs rename to src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceOptions.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Snap/GenObj.cs b/src/Umbraco.PublishedCache.NuCache/Snap/GenObj.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Snap/GenObj.cs rename to src/Umbraco.PublishedCache.NuCache/Snap/GenObj.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Snap/GenRef.cs b/src/Umbraco.PublishedCache.NuCache/Snap/GenRef.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Snap/GenRef.cs rename to src/Umbraco.PublishedCache.NuCache/Snap/GenRef.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/Snap/LinkedNode.cs b/src/Umbraco.PublishedCache.NuCache/Snap/LinkedNode.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/Snap/LinkedNode.cs rename to src/Umbraco.PublishedCache.NuCache/Snap/LinkedNode.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/SnapDictionary.cs rename to src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs diff --git a/src/Umbraco.Infrastructure.PublishedCache/Umbraco.Infrastructure.PublishedCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj similarity index 93% rename from src/Umbraco.Infrastructure.PublishedCache/Umbraco.Infrastructure.PublishedCache.csproj rename to src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index f818df2d41..f638e88b63 100644 --- a/src/Umbraco.Infrastructure.PublishedCache/Umbraco.Infrastructure.PublishedCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -2,6 +2,7 @@ netstandard2.0 + Umbraco.Infrastructure.PublishedCache diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/readme.md b/src/Umbraco.PublishedCache.NuCache/readme.md similarity index 100% rename from src/Umbraco.Infrastructure.PublishedCache/NuCache/readme.md rename to src/Umbraco.PublishedCache.NuCache/readme.md diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs index 00ba721bdb..739268b451 100644 --- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs +++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs @@ -5,7 +5,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core.Scoping; using Umbraco.Web.PublishedCache.NuCache; -using Umbraco.Web.PublishedCache.NuCache.Snap; namespace Umbraco.Tests.Cache { @@ -223,7 +222,7 @@ namespace Umbraco.Tests.Cache { var d = new SnapDictionary(); d.Test.CollectAuto = false; - + // gen 1 d.Set(1, "one"); Assert.AreEqual(1, d.Test.GetValues(1).Length); @@ -321,7 +320,7 @@ namespace Umbraco.Tests.Cache { var d = new SnapDictionary(); d.Test.CollectAuto = false; - + Assert.AreEqual(0, d.Test.GetValues(1).Length); // gen 1 @@ -416,7 +415,7 @@ namespace Umbraco.Tests.Cache { var d = new SnapDictionary(); d.Test.CollectAuto = false; - + // gen 1 d.Set(1, "one"); Assert.AreEqual(1, d.Test.GetValues(1).Length); @@ -578,7 +577,7 @@ namespace Umbraco.Tests.Cache { var d = new SnapDictionary(); d.Test.CollectAuto = false; - + d.Set(1, "one"); d.Set(2, "two"); @@ -875,7 +874,7 @@ namespace Umbraco.Tests.Cache { var d = new SnapDictionary(); d.Test.CollectAuto = false; - + // gen 1 d.Set(1, "one"); @@ -960,7 +959,7 @@ namespace Umbraco.Tests.Cache var d = new SnapDictionary(); var t = d.Test; t.CollectAuto = false; - + // gen 1 d.Set(1, "one"); var s1 = d.CreateSnapshot(); diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 34cd80fcd4..31cc85e5c5 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -564,9 +564,6 @@ {fbe7c065-dac0-4025-a78b-63b24d3ab00b} Umbraco.Configuration - - {f6de8da0-07cc-4ef2-8a59-2bc81dbb3830} - Umbraco.Infrastructure.PublishedCache {0fad7d2a-d7dd-45b1-91fd-488bb6cdacea} Umbraco.Examine.Lucene @@ -587,6 +584,10 @@ {33085570-9bf2-4065-a9b0-a29d920d13ba} Umbraco.Persistance.SqlCe + + {f6de8da0-07cc-4ef2-8a59-2bc81dbb3830} + Umbraco.PublishedCache.NuCache + {651E1350-91B6-44B7-BD60-7207006D7003} Umbraco.Web @@ -655,4 +656,4 @@ - + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 12eab15215..276eed8344 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -120,14 +120,14 @@ {0fad7d2a-d7dd-45b1-91fd-488bb6cdacea} Umbraco.Examine.Lucene - - {f6de8da0-07cc-4ef2-8a59-2bc81dbb3830} - Umbraco.Infrastructure.PublishedCache - {52ac0ba8-a60e-4e36-897b-e8b97a54ed1c} Umbraco.ModelsBuilder.Embedded + + {f6de8da0-07cc-4ef2-8a59-2bc81dbb3830} + Umbraco.PublishedCache.NuCache + {651e1350-91b6-44b7-bd60-7207006d7003} Umbraco.Web diff --git a/src/umbraco.sln b/src/umbraco.sln index 10a3a33b80..d54554434e 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -111,7 +111,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Persistance.SqlCe", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.TestData", "Umbraco.TestData\Umbraco.TestData.csproj", "{FB5676ED-7A69-492C-B802-E7B24144C0FC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Infrastructure.PublishedCache", "Umbraco.Infrastructure.PublishedCache\Umbraco.Infrastructure.PublishedCache.csproj", "{F6DE8DA0-07CC-4EF2-8A59-2BC81DBB3830}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.PublishedCache.NuCache", "Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj", "{F6DE8DA0-07CC-4EF2-8A59-2BC81DBB3830}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine", "Umbraco.Examine\Umbraco.Examine.csproj", "{F9B7FE05-0F93-4D0D-9C10-690B33ECBBD8}" EndProject