diff --git a/src/Umbraco.Abstractions/IExceptionFilterSettings.cs b/src/Umbraco.Abstractions/IExceptionFilterSettings.cs deleted file mode 100644 index f36a8d4d18..0000000000 --- a/src/Umbraco.Abstractions/IExceptionFilterSettings.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Umbraco.Abstractions -{ - public interface IExceptionFilterSettings - { - bool Disabled { get; } - } -} diff --git a/src/Umbraco.Configuration/ActiveDirectorySettings.cs b/src/Umbraco.Configuration/ActiveDirectorySettings.cs index 9498b4e8a2..2485edad66 100644 --- a/src/Umbraco.Configuration/ActiveDirectorySettings.cs +++ b/src/Umbraco.Configuration/ActiveDirectorySettings.cs @@ -1,5 +1,5 @@ using System.Configuration; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.Configuration { diff --git a/src/Umbraco.Configuration/ExceptionFilterSettings.cs b/src/Umbraco.Configuration/ExceptionFilterSettings.cs index 74d70281d9..628b8755cc 100644 --- a/src/Umbraco.Configuration/ExceptionFilterSettings.cs +++ b/src/Umbraco.Configuration/ExceptionFilterSettings.cs @@ -1,5 +1,5 @@ using System.Configuration; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.Configuration { diff --git a/src/Umbraco.Configuration/IndexCreatorSettings.cs b/src/Umbraco.Configuration/IndexCreatorSettings.cs index 242d62e8ce..00d1a29dba 100644 --- a/src/Umbraco.Configuration/IndexCreatorSettings.cs +++ b/src/Umbraco.Configuration/IndexCreatorSettings.cs @@ -1,5 +1,5 @@ using System.Configuration; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.Configuration { diff --git a/src/Umbraco.Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/ModelsBuilderConfig.cs index d4e898ea2e..9f24bf3d8b 100644 --- a/src/Umbraco.Configuration/ModelsBuilderConfig.cs +++ b/src/Umbraco.Configuration/ModelsBuilderConfig.cs @@ -2,7 +2,7 @@ using System.Configuration; using System.IO; using System.Threading; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Core.IO; diff --git a/src/Umbraco.Configuration/ModelsModeExtensions.cs b/src/Umbraco.Configuration/ModelsModeExtensions.cs index f6e718bc82..8d1b51cd28 100644 --- a/src/Umbraco.Configuration/ModelsModeExtensions.cs +++ b/src/Umbraco.Configuration/ModelsModeExtensions.cs @@ -1,4 +1,4 @@ -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.Configuration { diff --git a/src/Umbraco.Configuration/NuCacheSettings.cs b/src/Umbraco.Configuration/NuCacheSettings.cs index 00d82c4e90..c3a286d33d 100644 --- a/src/Umbraco.Configuration/NuCacheSettings.cs +++ b/src/Umbraco.Configuration/NuCacheSettings.cs @@ -1,5 +1,5 @@ using System.Configuration; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.Configuration { diff --git a/src/Umbraco.Configuration/RuntimeSettings.cs b/src/Umbraco.Configuration/RuntimeSettings.cs index cfaf32f45a..6dc8d6f832 100644 --- a/src/Umbraco.Configuration/RuntimeSettings.cs +++ b/src/Umbraco.Configuration/RuntimeSettings.cs @@ -1,5 +1,5 @@ using System.Configuration; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.Configuration { diff --git a/src/Umbraco.Configuration/TypeFinderSettings.cs b/src/Umbraco.Configuration/TypeFinderSettings.cs index 9c6341a726..bb3063d7bf 100644 --- a/src/Umbraco.Configuration/TypeFinderSettings.cs +++ b/src/Umbraco.Configuration/TypeFinderSettings.cs @@ -1,5 +1,5 @@ using System.Configuration; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core; namespace Umbraco.Configuration diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj index 2283672828..57fca1dfd6 100644 --- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj +++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj @@ -26,7 +26,6 @@ - diff --git a/src/Umbraco.Abstractions/IActiveDirectorySettings.cs b/src/Umbraco.Core/Configuration/IActiveDirectorySettings.cs similarity index 72% rename from src/Umbraco.Abstractions/IActiveDirectorySettings.cs rename to src/Umbraco.Core/Configuration/IActiveDirectorySettings.cs index df0b8c723a..e6b9202c06 100644 --- a/src/Umbraco.Abstractions/IActiveDirectorySettings.cs +++ b/src/Umbraco.Core/Configuration/IActiveDirectorySettings.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Abstractions +namespace Umbraco.Core.Configuration { public interface IActiveDirectorySettings { diff --git a/src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs b/src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs new file mode 100644 index 0000000000..169c04da5f --- /dev/null +++ b/src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs @@ -0,0 +1,7 @@ +namespace Umbraco.Core.Configuration +{ + public interface IExceptionFilterSettings + { + bool Disabled { get; } + } +} diff --git a/src/Umbraco.Abstractions/IIndexCreatorSettings.cs b/src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs similarity index 72% rename from src/Umbraco.Abstractions/IIndexCreatorSettings.cs rename to src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs index dbeb018736..b3e2854a0d 100644 --- a/src/Umbraco.Abstractions/IIndexCreatorSettings.cs +++ b/src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Abstractions +namespace Umbraco.Core.Configuration { public interface IIndexCreatorSettings { diff --git a/src/Umbraco.Abstractions/IModelsBuilderConfig.cs b/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs similarity index 90% rename from src/Umbraco.Abstractions/IModelsBuilderConfig.cs rename to src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs index 5d6540e6cf..6a071ac277 100644 --- a/src/Umbraco.Abstractions/IModelsBuilderConfig.cs +++ b/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Abstractions +namespace Umbraco.Core.Configuration { public interface IModelsBuilderConfig { diff --git a/src/Umbraco.Abstractions/INuCacheSettings.cs b/src/Umbraco.Core/Configuration/INuCacheSettings.cs similarity index 69% rename from src/Umbraco.Abstractions/INuCacheSettings.cs rename to src/Umbraco.Core/Configuration/INuCacheSettings.cs index f2a622da40..c6524297a6 100644 --- a/src/Umbraco.Abstractions/INuCacheSettings.cs +++ b/src/Umbraco.Core/Configuration/INuCacheSettings.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Abstractions +namespace Umbraco.Core.Configuration { public interface INuCacheSettings { diff --git a/src/Umbraco.Abstractions/IRuntimeSettings.cs b/src/Umbraco.Core/Configuration/IRuntimeSettings.cs similarity index 77% rename from src/Umbraco.Abstractions/IRuntimeSettings.cs rename to src/Umbraco.Core/Configuration/IRuntimeSettings.cs index 1a6e1ae26a..915e774186 100644 --- a/src/Umbraco.Abstractions/IRuntimeSettings.cs +++ b/src/Umbraco.Core/Configuration/IRuntimeSettings.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Abstractions +namespace Umbraco.Core.Configuration { public interface IRuntimeSettings { diff --git a/src/Umbraco.Abstractions/ITypeFinderSettings.cs b/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs similarity index 74% rename from src/Umbraco.Abstractions/ITypeFinderSettings.cs rename to src/Umbraco.Core/Configuration/ITypeFinderSettings.cs index 82d7922b9b..15e72a1f40 100644 --- a/src/Umbraco.Abstractions/ITypeFinderSettings.cs +++ b/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Abstractions +namespace Umbraco.Core.Configuration { public interface ITypeFinderSettings { diff --git a/src/Umbraco.Abstractions/ModelsMode.cs b/src/Umbraco.Core/Configuration/ModelsMode.cs similarity index 93% rename from src/Umbraco.Abstractions/ModelsMode.cs rename to src/Umbraco.Core/Configuration/ModelsMode.cs index 3ab646897b..2483367394 100644 --- a/src/Umbraco.Abstractions/ModelsMode.cs +++ b/src/Umbraco.Core/Configuration/ModelsMode.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Abstractions +namespace Umbraco.Core.Configuration { /// /// Defines the models generation modes. @@ -8,7 +8,7 @@ /// /// Do not generate models. /// - Nothing = 0, // default value + Nothing = 0, // default value /// /// Generate models in memory. diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs index ce9abb1ad5..b1d529e6c6 100644 --- a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs +++ b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs @@ -4,7 +4,7 @@ using System.IO; using Examine; using Examine.LuceneEngine.Directories; using Lucene.Net.Store; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.IO; diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index 83c63ac3e8..932d6d318b 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -26,7 +26,6 @@ - diff --git a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs index 8b7e9583e5..0f60a7580c 100644 --- a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs +++ b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs @@ -4,7 +4,7 @@ using Umbraco.Core.Services; using Lucene.Net.Analysis.Standard; using Examine.LuceneEngine; using Examine; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.IO; diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs index e14c73b5b7..d0b8714aa8 100644 --- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs +++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs @@ -1,4 +1,4 @@ -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 2da35392a0..44d520c69d 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -62,7 +62,6 @@ - diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs index 387b71df5f..75affe09e7 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs @@ -1,4 +1,4 @@ -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.ModelsBuilder.Embedded.BackOffice diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs index 6cae8d5d4b..1e96e64df8 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; using Umbraco.Web.Editors; diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs index 5e249425cc..7ea9c263de 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs @@ -1,5 +1,5 @@ using System.Text; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Configuration; namespace Umbraco.ModelsBuilder.Embedded.BackOffice diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs index 9ff43be5ae..fcd42908e7 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs @@ -1,4 +1,4 @@ -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.ModelsBuilder.Embedded.BackOffice diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs index e1f1c930b3..2e249eed4d 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs @@ -1,4 +1,4 @@ -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.ModelsBuilder.Embedded.BackOffice diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs index 1b4ec2ef08..5fb0639ac5 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Http; using System.Runtime.Serialization; using System.Web.Hosting; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Configuration; using Umbraco.Core.Exceptions; using Umbraco.ModelsBuilder.Embedded.Building; diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs index e9ab4a5a14..7423a3a3ad 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Configuration; namespace Umbraco.ModelsBuilder.Embedded.Building diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs index fdfffad578..192f049930 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs @@ -1,6 +1,6 @@ using System.IO; using System.Text; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.ModelsBuilder.Embedded.Building { diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs index f8f1cb73bc..4c796f3c7b 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.ModelsBuilder.Embedded.Building { diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs index d43f5e7b34..0c25a29d70 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs @@ -4,7 +4,7 @@ using System.Reflection; using System.Web; using System.Web.Mvc; using System.Web.Routing; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Configuration; using Umbraco.Core.Composing; using Umbraco.Core.IO; diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs index d0296996ea..008cdb2250 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Reflection; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Configuration; using Umbraco.Core; using Umbraco.Core.Logging; diff --git a/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs index df12f56dd9..d625c754c5 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs @@ -1,5 +1,4 @@ -using Umbraco.Abstractions; -using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration; namespace Umbraco.ModelsBuilder.Embedded { diff --git a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs index 16106f1384..61d39cd373 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs @@ -1,6 +1,6 @@ using System; using System.Threading; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Configuration; using Umbraco.Core.Hosting; using Umbraco.Core.Logging; diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs index ed0e59b43f..5b498fd5f3 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Text; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.ModelsBuilder.Embedded { diff --git a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs index da08a5a07a..0e93030438 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs @@ -1,5 +1,5 @@ using System.IO; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Web.Cache; namespace Umbraco.ModelsBuilder.Embedded diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs index 7c426ae584..bef2fa8414 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs @@ -11,7 +11,7 @@ using System.Threading; using System.Web; using System.Web.Compilation; using System.Web.WebPages.Razor; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Core.Hosting; using Umbraco.Core.Logging; diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj index f1514d9618..5f072be561 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj +++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj @@ -97,10 +97,6 @@ - - {D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD} - Umbraco.Abstractions - {FBE7C065-DAC0-4025-A78B-63B24D3AB00B} Umbraco.Configuration @@ -127,8 +123,5 @@ 5.2.7 - - - \ No newline at end of file diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs index 5bbe6020a9..ad7cc72eec 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs @@ -1,7 +1,7 @@ using System.Configuration; using CSharpTest.Net.Collections; using CSharpTest.Net.Serialization; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; namespace Umbraco.Web.PublishedCache.NuCache.DataSource { diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs index 7f8de34747..74295b7182 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Threading; using CSharpTest.Net.Collections; using Newtonsoft.Json; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index 81fd3f9383..75eeca268b 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -12,7 +12,6 @@ - diff --git a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs index f4afc1cb34..b3f644ae43 100644 --- a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs +++ b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using Moq; using NUnit.Framework; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core.Models.PublishedContent; using Umbraco.ModelsBuilder.Embedded; using Umbraco.ModelsBuilder.Embedded.Building; diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs index 03819fb041..de12fcf7aa 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs @@ -4,7 +4,6 @@ using System.Data; using System.Linq; using Moq; using NUnit.Framework; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs index 224f5f0eb6..08da25ba9a 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs @@ -4,7 +4,6 @@ using System.Data; using System.Linq; using Moq; using NUnit.Framework; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs index 841ee93c50..783beafb2e 100644 --- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Web.Routing; using Moq; using NUnit.Framework; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs index 3bc6e4c2eb..1b6b632a10 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading; using Moq; using NUnit.Framework; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 4c1727305b..9815c94728 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -558,10 +558,6 @@ - - {D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD} - Umbraco.Abstractions - {fbe7c065-dac0-4025-a78b-63b24d3ab00b} Umbraco.Configuration diff --git a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs index 9b7f1a0838..994e8c26c4 100644 --- a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs +++ b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Reflection; using System.Security; using System.Web.Compilation; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Hosting; diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index a09ca9b421..4a8d441192 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -11,7 +11,6 @@ using Microsoft.AspNet.Identity; using Microsoft.AspNet.Identity.Owin; using Microsoft.Owin.Security; using Newtonsoft.Json; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs index 0d18b6b09a..f229f908d0 100644 --- a/src/Umbraco.Web/Editors/BackOfficeModel.cs +++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs @@ -1,5 +1,4 @@ -using Umbraco.Abstractions; -using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Hosting; using Umbraco.Core.IO; diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs index 665b35e18e..e2ea9c3234 100644 --- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs +++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Umbraco.Abstractions; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Hosting; diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs index 756a426254..73264c6448 100644 --- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs @@ -7,7 +7,6 @@ using System.Web; using System.Web.Mvc; using ClientDependency.Core.Config; using Microsoft.Owin.Security; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Web.Features; diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs index 6b4432838a..0ed31e3972 100644 --- a/src/Umbraco.Web/Editors/PreviewController.cs +++ b/src/Umbraco.Web/Editors/PreviewController.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Web; using System.Web.Mvc; using System.Web.UI; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs index c9ebd0337f..806f32b620 100644 --- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs +++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.Mvc; using Microsoft.Owin.Security; using Newtonsoft.Json; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core.Hosting; using Umbraco.Core.IO; using Umbraco.Web.Composing; diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs index a09c4a9605..82c87c0e0b 100644 --- a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs +++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs @@ -3,7 +3,7 @@ using System.Configuration; using System.Net; using System.Text.RegularExpressions; using System.Web.Mvc; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Web.Composing; diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs index bcc1ec865a..106beaa6c7 100644 --- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs +++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs @@ -9,7 +9,6 @@ using System.Web.Mvc; using System.Web.Routing; using ClientDependency.Core.CompositeFiles.Providers; using ClientDependency.Core.Config; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs index 8d5ad2af56..af7aebce3a 100644 --- a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs +++ b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs @@ -1,7 +1,7 @@ using System; using System.DirectoryServices.AccountManagement; using System.Threading.Tasks; -using Umbraco.Abstractions; +using Umbraco.Core.Configuration; using Umbraco.Web.Models.Identity; namespace Umbraco.Web.Security diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 8ad85ffdc5..fb96847eb4 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -106,10 +106,6 @@ - - {D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD} - Umbraco.Abstractions - {fbe7c065-dac0-4025-a78b-63b24d3ab00b} Umbraco.Configuration diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs index 13328913a3..2375e4a57b 100644 --- a/src/Umbraco.Web/UmbracoApplication.cs +++ b/src/Umbraco.Web/UmbracoApplication.cs @@ -1,6 +1,5 @@ using System.Threading; using System.Web; -using Umbraco.Abstractions; using Umbraco.Core; using Umbraco.Core.Runtime; using Umbraco.Core.Configuration; diff --git a/src/umbraco.sln b/src/umbraco.sln index 2e0316206a..6c87dfcef3 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -117,8 +117,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "U EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Abstractions", "Umbraco.Abstractions\Umbraco.Abstractions.csproj", "{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -179,10 +177,6 @@ Global {9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.Build.0 = Release|Any CPU - {D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE