Merged Umbraco.Abstractions into Umbraco.Core

This commit is contained in:
Bjarke Berg
2020-03-03 13:42:07 +01:00
parent efd8e37f34
commit 53953338d8
62 changed files with 49 additions and 87 deletions

View File

@@ -1,7 +0,0 @@
namespace Umbraco.Abstractions
{
public interface IExceptionFilterSettings
{
bool Disabled { get; }
}
}

View File

@@ -1,5 +1,5 @@
using System.Configuration;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.Configuration
{

View File

@@ -1,5 +1,5 @@
using System.Configuration;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.Configuration
{

View File

@@ -1,5 +1,5 @@
using System.Configuration;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.Configuration
{

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.Configuration
{

View File

@@ -1,5 +1,5 @@
using System.Configuration;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.Configuration
{

View File

@@ -1,5 +1,5 @@
using System.Configuration;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.Configuration
{

View File

@@ -1,5 +1,5 @@
using System.Configuration;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Core;
namespace Umbraco.Configuration

View File

@@ -26,7 +26,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
</ItemGroup>

View File

@@ -1,4 +1,4 @@
namespace Umbraco.Abstractions
namespace Umbraco.Core.Configuration
{
public interface IActiveDirectorySettings
{

View File

@@ -0,0 +1,7 @@
namespace Umbraco.Core.Configuration
{
public interface IExceptionFilterSettings
{
bool Disabled { get; }
}
}

View File

@@ -1,4 +1,4 @@
namespace Umbraco.Abstractions
namespace Umbraco.Core.Configuration
{
public interface IIndexCreatorSettings
{

View File

@@ -1,4 +1,4 @@
namespace Umbraco.Abstractions
namespace Umbraco.Core.Configuration
{
public interface IModelsBuilderConfig
{

View File

@@ -1,4 +1,4 @@
namespace Umbraco.Abstractions
namespace Umbraco.Core.Configuration
{
public interface INuCacheSettings
{

View File

@@ -1,4 +1,4 @@
namespace Umbraco.Abstractions
namespace Umbraco.Core.Configuration
{
public interface IRuntimeSettings
{

View File

@@ -1,4 +1,4 @@
namespace Umbraco.Abstractions
namespace Umbraco.Core.Configuration
{
public interface ITypeFinderSettings
{

View File

@@ -1,4 +1,4 @@
namespace Umbraco.Abstractions
namespace Umbraco.Core.Configuration
{
/// <summary>
/// Defines the models generation modes.
@@ -8,7 +8,7 @@
/// <summary>
/// Do not generate models.
/// </summary>
Nothing = 0, // default value
Nothing = 0, // default value
/// <summary>
/// Generate models in memory.

View File

@@ -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;

View File

@@ -26,7 +26,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
<ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
</ItemGroup>

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;

View File

@@ -62,7 +62,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
<ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
</ItemGroup>

View File

@@ -1,4 +1,4 @@
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice

View File

@@ -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;

View File

@@ -1,5 +1,5 @@
using System.Text;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Configuration;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice

View File

@@ -1,4 +1,4 @@
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice

View File

@@ -1,4 +1,4 @@
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice

View File

@@ -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;

View File

@@ -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

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.ModelsBuilder.Embedded.Building
{

View File

@@ -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
{

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,5 +1,4 @@
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration;
namespace Umbraco.ModelsBuilder.Embedded
{

View File

@@ -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;

View File

@@ -1,7 +1,7 @@
using System;
using System.IO;
using System.Text;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
namespace Umbraco.ModelsBuilder.Embedded
{

View File

@@ -1,5 +1,5 @@
using System.IO;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Web.Cache;
namespace Umbraco.ModelsBuilder.Embedded

View File

@@ -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;

View File

@@ -97,10 +97,6 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
<Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
<Name>Umbraco.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
<Project>{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}</Project>
<Name>Umbraco.Configuration</Name>
@@ -127,8 +123,5 @@
<Version>5.2.7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Configuration\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -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
{

View File

@@ -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;

View File

@@ -12,7 +12,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
<ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
</ItemGroup>

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -558,10 +558,6 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
<Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
<Name>Umbraco.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
<Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
<Name>Umbraco.Configuration</Name>

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using Umbraco.Abstractions;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.Hosting;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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

View File

@@ -106,10 +106,6 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
<Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
<Name>Umbraco.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
<Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
<Name>Umbraco.Configuration</Name>

View File

@@ -1,6 +1,5 @@
using System.Threading;
using System.Web;
using Umbraco.Abstractions;
using Umbraco.Core;
using Umbraco.Core.Runtime;
using Umbraco.Core.Configuration;

View File

@@ -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