diff --git a/src/Umbraco.Core/Collections/CompositeIntStringKey.cs b/src/Umbraco.Abstractions/Collections/CompositeIntStringKey.cs similarity index 100% rename from src/Umbraco.Core/Collections/CompositeIntStringKey.cs rename to src/Umbraco.Abstractions/Collections/CompositeIntStringKey.cs diff --git a/src/Umbraco.Core/Collections/CompositeNStringNStringKey.cs b/src/Umbraco.Abstractions/Collections/CompositeNStringNStringKey.cs similarity index 100% rename from src/Umbraco.Core/Collections/CompositeNStringNStringKey.cs rename to src/Umbraco.Abstractions/Collections/CompositeNStringNStringKey.cs diff --git a/src/Umbraco.Core/Collections/CompositeStringStringKey.cs b/src/Umbraco.Abstractions/Collections/CompositeStringStringKey.cs similarity index 100% rename from src/Umbraco.Core/Collections/CompositeStringStringKey.cs rename to src/Umbraco.Abstractions/Collections/CompositeStringStringKey.cs diff --git a/src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs b/src/Umbraco.Abstractions/Collections/CompositeTypeTypeKey.cs similarity index 95% rename from src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs rename to src/Umbraco.Abstractions/Collections/CompositeTypeTypeKey.cs index cc555afe55..e08e3305d2 100644 --- a/src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs +++ b/src/Umbraco.Abstractions/Collections/CompositeTypeTypeKey.cs @@ -5,7 +5,7 @@ namespace Umbraco.Core.Collections /// /// Represents a composite key of (Type, Type) for fast dictionaries. /// - internal struct CompositeTypeTypeKey : IEquatable + public struct CompositeTypeTypeKey : IEquatable { /// /// Initializes a new instance of the struct. diff --git a/src/Umbraco.Core/Collections/ConcurrentHashSet.cs b/src/Umbraco.Abstractions/Collections/ConcurrentHashSet.cs similarity index 100% rename from src/Umbraco.Core/Collections/ConcurrentHashSet.cs rename to src/Umbraco.Abstractions/Collections/ConcurrentHashSet.cs diff --git a/src/Umbraco.Core/Collections/ObservableDictionary.cs b/src/Umbraco.Abstractions/Collections/ObservableDictionary.cs similarity index 100% rename from src/Umbraco.Core/Collections/ObservableDictionary.cs rename to src/Umbraco.Abstractions/Collections/ObservableDictionary.cs diff --git a/src/Umbraco.Core/Collections/OrderedHashSet.cs b/src/Umbraco.Abstractions/Collections/OrderedHashSet.cs similarity index 95% rename from src/Umbraco.Core/Collections/OrderedHashSet.cs rename to src/Umbraco.Abstractions/Collections/OrderedHashSet.cs index beae17adea..52b37bc7f9 100644 --- a/src/Umbraco.Core/Collections/OrderedHashSet.cs +++ b/src/Umbraco.Abstractions/Collections/OrderedHashSet.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Collections /// and is customizable to keep the newest or oldest equatable item /// /// - internal class OrderedHashSet : KeyedCollection + public class OrderedHashSet : KeyedCollection { private readonly bool _keepOldest; diff --git a/src/Umbraco.Core/Collections/TopoGraph.cs b/src/Umbraco.Abstractions/Collections/TopoGraph.cs similarity index 100% rename from src/Umbraco.Core/Collections/TopoGraph.cs rename to src/Umbraco.Abstractions/Collections/TopoGraph.cs diff --git a/src/Umbraco.Core/Collections/TypeList.cs b/src/Umbraco.Abstractions/Collections/TypeList.cs similarity index 95% rename from src/Umbraco.Core/Collections/TypeList.cs rename to src/Umbraco.Abstractions/Collections/TypeList.cs index 37ca427ba1..43df5f1af4 100644 --- a/src/Umbraco.Core/Collections/TypeList.cs +++ b/src/Umbraco.Abstractions/Collections/TypeList.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Collections /// /// Types in the list are, or derive from, or implement, the base type. /// The base type. - internal class TypeList + public class TypeList { private readonly List _list = new List(); @@ -30,4 +30,4 @@ namespace Umbraco.Core.Collections return _list.Contains(type); } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 99686e5bbb..42f7cdbc4a 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -117,6 +117,8 @@ --> + + @@ -149,15 +151,6 @@ - - - - - - - - - @@ -863,7 +856,6 @@ - @@ -1443,7 +1435,6 @@ -