Merge branch 'vx/feature/unicore' of https://github.com/umbraco/Umbraco-CMS into vx/feature/unicore

src/Umbraco.Abstractions/AsyncLock.cs

@@ -21,7 +21,7 @@ namespace Umbraco.Core
     // been closed, the Semaphore system object is destroyed - so in any case
     // an iisreset should clean up everything
     //
-    internal class AsyncLock
+    public class AsyncLock
     {
         private readonly SemaphoreSlim _semaphore;
         private readonly Semaphore _semaphore2;

src/Umbraco.Abstractions/Direction.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
+namespace Umbraco.Core
 {
     public enum Direction
     {

src/Umbraco.Abstractions/EnumerableExtensions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core
 {
@@ -10,6 +9,45 @@ namespace Umbraco.Core
     ///</summary>
     public static class EnumerableExtensions
     {
+        // based upon the original Zip<T1, T2, TResult> method
+        public static IEnumerable<TResult> Zip<T1, T2, T3, TResult>(this IEnumerable<T1> e1, IEnumerable<T2> e2, IEnumerable<T3> e3,
+            Func<T1, T2, T3, TResult> resultSelector)
+        {
+            if (e1 == null) throw new ArgumentNullException("e1");
+            if (e2 == null) throw new ArgumentNullException("e2");
+            if (e3 == null) throw new ArgumentNullException("e3");
+            if (resultSelector == null) throw new ArgumentNullException("resultSelector");
+            return ZipIterator(e1, e2, e3, resultSelector);
+        }
+
+        private static IEnumerable<TResult> ZipIterator<T1, T2, T3, TResult>(IEnumerable<T1> ie1, IEnumerable<T2> ie2, IEnumerable<T3> ie3,
+            Func<T1, T2, T3, TResult> resultSelector)
+        {
+            var e1 = ie1.GetEnumerator();
+            try
+            {
+                var e2 = ie2.GetEnumerator();
+                var e3 = ie3.GetEnumerator();
+                try
+                {
+                    while (e1.MoveNext() && e2.MoveNext() && e3.MoveNext())
+                        yield return resultSelector(e1.Current, e2.Current, e3.Current);
+                }
+                finally
+                {
+                    if (e2 != null)
+                        e2.Dispose();
+                    if (e3 != null)
+                        e3.Dispose();
+                }
+            }
+            finally
+            {
+                if (e1 != null)
+                    e1.Dispose();
+            }
+        }
+
         internal static bool HasDuplicates<T>(this IEnumerable<T> items, bool includeNull)
         {
             var hs = new HashSet<T>();

src/Umbraco.Abstractions/Exceptions/ConnectionException.cs

@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Exceptions
 {
-    internal class ConnectionException : Exception
+    public class ConnectionException : Exception
     {
         public ConnectionException(string message, Exception innerException) : base(message, innerException)
         {

src/Umbraco.Abstractions/Exceptions/DataOperationException.cs

@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Exceptions
 {
-    internal class DataOperationException<T> : Exception
+    public class DataOperationException<T> : Exception
     {
         public T Operation { get; private set; }
 

src/Umbraco.Abstractions/HexEncoder.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core
     /// <summary>
     /// Provides methods for encoding byte arrays into hexadecimal strings.
     /// </summary>
-    internal static class HexEncoder
+    public static class HexEncoder
     {
         // LUT's that provide the hexadecimal representation of each possible byte value.
         private static readonly char[] HexLutBase = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };

src/Umbraco.Abstractions/WaitHandleExtensions.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 
 namespace Umbraco.Core
 {
-    internal static class WaitHandleExtensions
+    public static class WaitHandleExtensions
     {
 
         // http://stackoverflow.com/questions/25382583/waiting-on-a-named-semaphore-with-waitone100-vs-waitone0-task-delay100

src/Umbraco.Core/ListExtensions.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides extensions to the List type.
-    /// </summary>
-    internal static class ListExtensions
-    {
-        // based upon the original Zip<T1, T2, TResult> method
-        public static IEnumerable<TResult> Zip<T1, T2, T3, TResult>(this IEnumerable<T1> e1, IEnumerable<T2> e2, IEnumerable<T3> e3,
-            Func<T1, T2, T3, TResult> resultSelector)
-        {
-            if (e1 == null) throw new ArgumentNullException("e1");
-            if (e2 == null) throw new ArgumentNullException("e2");
-            if (e3 == null) throw new ArgumentNullException("e3");
-            if (resultSelector == null) throw new ArgumentNullException("resultSelector");
-            return ZipIterator(e1, e2, e3, resultSelector);
-        }
-
-        private static IEnumerable<TResult> ZipIterator<T1, T2,T3, TResult>(IEnumerable<T1> ie1, IEnumerable<T2> ie2, IEnumerable<T3> ie3,
-            Func<T1, T2, T3, TResult> resultSelector)
-        {
-            var e1 = ie1.GetEnumerator();
-            try
-            {
-                var e2 = ie2.GetEnumerator();
-                var e3 = ie3.GetEnumerator();
-                try
-                {
-                    while (e1.MoveNext() && e2.MoveNext() && e3.MoveNext())
-                        yield return resultSelector(e1.Current, e2.Current, e3.Current);
-                }
-                finally
-                {
-                    if (e2 != null)
-                        e2.Dispose();
-                    if (e3 != null)
-                        e3.Dispose();
-                }
-            }
-            finally
-            {
-                if (e1 != null)
-                    e1.Dispose();
-            }
-        }
-    }
-}

src/Umbraco.Core/Umbraco.Core.csproj

@@ -117,7 +117,6 @@
     </Compile>
     -->
     <Compile Include="AssemblyExtensions.cs" />
-    <Compile Include="AsyncLock.cs" />
     <Compile Include="Cache\AppPolicedCacheDictionary.cs" />
     <Compile Include="Compose\AuditEventsComponent.cs" />
     <Compile Include="BindingRedirects.cs" />
@@ -196,6 +195,7 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
+    <Compile Include="Exceptions\InvalidCompositionException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />
@@ -234,6 +234,7 @@
     <Compile Include="PublishedModelFactoryExtensions.cs" />
     <Compile Include="Services\PropertyValidationService.cs" />
     <Compile Include="Composing\TypeCollectionBuilderBase.cs" />
+    <Compile Include="StringExtensions.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="Composing\WeightAttribute.cs" />
     <Compile Include="Composing\WeightedCollectionBuilderBase.cs" />
@@ -343,7 +344,6 @@
     <Compile Include="IO\IFileSystems.cs" />
     <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="GuidUtils.cs" />
-    <Compile Include="HexEncoder.cs" />
     <Compile Include="IO\MediaPathSchemes\CombinedGuidsMediaPathScheme.cs" />
     <Compile Include="IO\IMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\OriginalMediaPathScheme.cs" />
@@ -545,7 +545,6 @@
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />
     <Compile Include="PropertyEditors\ValueListConfiguration.cs" />
     <Compile Include="PropertyEditors\VoidEditor.cs" />
-    <Compile Include="ReadLock.cs" />
     <Compile Include="ReflectionUtilities-Unused.cs" />
     <Compile Include="RuntimeLevelReason.cs" />
     <Compile Include="RuntimeOptions.cs" />
@@ -562,7 +561,6 @@
     <Compile Include="DataTableExtensions.cs" />
     <Compile Include="DateTimeExtensions.cs" />
     <Compile Include="DecimalExtensions.cs" />
-    <Compile Include="DelegateEqualityComparer.cs" />
     <Compile Include="DelegateExtensions.cs" />
     <Compile Include="Deploy\ArtifactBase.cs" />
     <Compile Include="Deploy\ArtifactDependency.cs" />
@@ -592,8 +590,6 @@
     <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />
     <Compile Include="Logging\DisposableTimer.cs" />
     <Compile Include="EmailSender.cs" />
-    <Compile Include="Enum.cs" />
-    <Compile Include="EnumerableExtensions.cs" />
     <Compile Include="Events\CancellableEventArgs.cs" />
     <Compile Include="Events\CancellableObjectEventArgs.cs" />
     <Compile Include="Events\ContentCacheEventArgs.cs" />
@@ -636,14 +632,7 @@
     <Compile Include="Events\TransientEventMessagesFactory.cs" />
     <Compile Include="Events\TypedEventHandler.cs" />
     <Compile Include="Events\UninstallPackageEventArgs.cs" />
-    <Compile Include="Exceptions\ArgumentNullOrEmptyException.cs" />
-    <Compile Include="Exceptions\AuthorizationException.cs" />
-    <Compile Include="Exceptions\BootFailedException.cs" />
-    <Compile Include="Exceptions\ConnectionException.cs" />
-    <Compile Include="Exceptions\DataOperationException.cs" />
-    <Compile Include="Exceptions\InvalidCompositionException.cs" />
     <Compile Include="Composing\LightInject\LightInjectException.cs" />
-    <Compile Include="Exceptions\WontImplementException.cs" />
     <Compile Include="ExpressionExtensions.cs" />
     <Compile Include="ExpressionHelper.cs" />
     <Compile Include="FileResources\Files.Designer.cs" />
@@ -653,7 +642,6 @@
     <Compile Include="HttpContextExtensions.cs" />
     <Compile Include="IDisposeOnRequestEnd.cs" />
     <Compile Include="IEmailSender.cs" />
-    <Compile Include="IfExtensions.cs" />
     <Compile Include="IntExtensions.cs" />
     <Compile Include="IO\FileSecurityException.cs" />
     <Compile Include="IO\FileSystemExtensions.cs" />
@@ -672,7 +660,6 @@
     <Compile Include="IRuntime.cs" />
     <Compile Include="IRuntimeState.cs" />
     <Compile Include="LambdaExpressionCacheKey.cs" />
-    <Compile Include="ListExtensions.cs" />
     <Compile Include="Logging\DebugDiagnosticsLogger.cs" />
     <Compile Include="Logging\ILogger.cs" />
     <Compile Include="Logging\IProfiler.cs" />
@@ -943,7 +930,6 @@
     <Compile Include="Persistence\DatabaseModelDefinitions\DbIndexDefinition.cs" />
     <Compile Include="Persistence\DatabaseModelDefinitions\DefinitionFactory.cs" />
     <Compile Include="Persistence\DatabaseModelDefinitions\DeletionDataDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\Direction.cs" />
     <Compile Include="Persistence\DatabaseModelDefinitions\ForeignKeyDefinition.cs" />
     <Compile Include="Persistence\DatabaseModelDefinitions\IndexColumnDefinition.cs" />
     <Compile Include="Persistence\DatabaseModelDefinitions\IndexDefinition.cs" />
@@ -1473,7 +1459,6 @@
     <Compile Include="Compose\RelateOnCopyComponent.cs" />
     <Compile Include="Compose\RelateOnTrashComponent.cs" />
     <Compile Include="SimpleMainDom.cs" />
-    <Compile Include="StringExtensions.cs" />
     <Compile Include="Strings\CleanStringType.cs" />
     <Compile Include="Strings\ContentBaseExtensions.cs" />
     <Compile Include="Strings\Css\StylesheetHelper.cs" />
@@ -1517,9 +1502,16 @@
     <Compile Include="UpgradeableReadLock.cs" />
     <Compile Include="UriExtensions.cs" />
     <Compile Include="VersionExtensions.cs" />
-    <Compile Include="WaitHandleExtensions.cs" />
-    <Compile Include="WriteLock.cs" />
     <Compile Include="XmlExtensions.cs" />
+    <Compile Include="PackageActions\IPackageAction.cs" />
+    <Compile Include="PackageActions\PackageActionCollection.cs" />
+    <Compile Include="PackageActions\PackageActionCollectionBuilder.cs" />
+    <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
     <Compile Include="Xml\DynamicContext.cs" />
     <Compile Include="Xml\UmbracoXPathPathSyntaxParser.cs" />
     <Compile Include="Xml\XmlHelper.cs" />
@@ -1534,15 +1526,6 @@
     <Compile Include="Xml\XPath\MacroNavigator.cs" />
     <Compile Include="Xml\XPath\NavigableNavigator.cs" />
     <Compile Include="Xml\XPath\RenamedRootNavigator.cs" />
-    <Compile Include="PackageActions\IPackageAction.cs" />
-    <Compile Include="PackageActions\PackageActionCollection.cs" />
-    <Compile Include="PackageActions\PackageActionCollectionBuilder.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="FileResources\BlockingWeb.config" />

src/Umbraco.Tests/Logging/LogviewerTests.cs

@@ -3,9 +3,9 @@ using NUnit.Framework;
 using System;
 using System.IO;
 using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging.Viewer;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Tests.Logging
 {

src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs

@@ -2,15 +2,12 @@
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Logging;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
+using Umbraco.Core;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {

src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs

@@ -3,20 +3,18 @@ using System.Linq;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
 using Umbraco.Tests.Testing;
 using Umbraco.Core.Services;
+using Umbraco.Core;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {

src/Umbraco.Web/Editors/BackOfficeServerVariables.cs

@@ -199,7 +199,7 @@ namespace Umbraco.Web.Editors
                         },
                         {
                             "logApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<LogController>(
-                                controller => controller.GetPagedEntityLog(0, 0, 0, Core.Persistence.DatabaseModelDefinitions.Direction.Ascending, null))
+                                controller => controller.GetPagedEntityLog(0, 0, 0, Direction.Ascending, null))
                         },
                         {
                             "memberApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<MemberController>(

src/Umbraco.Web/Editors/LogController.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi.Filters;

src/Umbraco.Web/Editors/LogViewerController.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Http;
+using Umbraco.Core;
 using Umbraco.Core.Logging.Viewer;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;