Netcore: Align namespaces (#9801)

* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
This commit is contained in:
Mole
2021-02-18 11:06:02 +01:00
committed by GitHub
parent f1717a17f5
commit bf41c2eeaa
3188 changed files with 12023 additions and 11215 deletions

View File

@@ -1,13 +1,13 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Security;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Security;
using Umbraco.Extensions;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentAppFactoryCollection : BuilderCollectionBase<IContentAppFactory>
{

View File

@@ -3,15 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.IO;
using Umbraco.Core.Manifest;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Identity;
using Umbraco.Core.Security;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Manifest;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Security;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentAppFactoryCollectionBuilder : OrderedCollectionBuilderBase<ContentAppFactoryCollectionBuilder, ContentAppFactoryCollection, IContentAppFactory>
{

View File

@@ -1,11 +1,9 @@
using System;
using System.Collections.Generic;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentEditorContentAppFactory : IContentAppFactory
{

View File

@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Models;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentInfoContentAppFactory : IContentAppFactory
{

View File

@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Models;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentTypeDesignContentAppFactory : IContentAppFactory
{

View File

@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Models;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentTypeListViewContentAppFactory : IContentAppFactory
{

View File

@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Models;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentTypePermissionsContentAppFactory : IContentAppFactory
{

View File

@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Models;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ContentTypeTemplatesContentAppFactory : IContentAppFactory
{

View File

@@ -1,14 +1,13 @@
using System;
using System.Collections.Generic;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.ContentEditing;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Services;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Services;
using Umbraco.Extensions;
namespace Umbraco.Web.ContentApps
namespace Umbraco.Cms.Core.ContentApps
{
public class ListViewContentAppFactory : IContentAppFactory
{
@@ -36,14 +35,14 @@ namespace Umbraco.Web.ContentApps
case IContent content:
contentTypeAlias = content.ContentType.Alias;
entityType = "content";
dtdId = Core.Constants.DataTypes.DefaultContentListView;
dtdId = Constants.DataTypes.DefaultContentListView;
break;
case IMedia media when !media.ContentType.IsContainer && media.ContentType.Alias != Core.Constants.Conventions.MediaTypes.Folder:
case IMedia media when !media.ContentType.IsContainer && media.ContentType.Alias != Constants.Conventions.MediaTypes.Folder:
return null;
case IMedia media:
contentTypeAlias = media.ContentType.Alias;
entityType = "media";
dtdId = Core.Constants.DataTypes.DefaultMediaListView;
dtdId = Constants.DataTypes.DefaultMediaListView;
break;
default:
return null;
@@ -72,7 +71,7 @@ namespace Umbraco.Web.ContentApps
Weight = Weight
};
var customDtdName = Core.Constants.Conventions.DataTypes.ListViewPrefix + contentTypeAlias;
var customDtdName = Constants.Conventions.DataTypes.ListViewPrefix + contentTypeAlias;
//first try to get the custom one if there is one
var dt = dataTypeService.GetDataType(customDtdName)
@@ -121,7 +120,7 @@ namespace Umbraco.Web.ContentApps
{
new ContentPropertyDisplay
{
Alias = $"{Core.Constants.PropertyEditors.InternalGenericPropertiesPrefix}containerView",
Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}containerView",
Label = "",
Value = null,
View = editor.GetValueEditor().View,