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

@@ -10,11 +10,12 @@ using System.Diagnostics;
using System.Linq;
using System.Threading;
using Microsoft.Extensions.Logging;
using Umbraco.Core.Configuration;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Persistence;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
public abstract class BaseTestDatabase
{
@@ -126,7 +127,7 @@ namespace Umbraco.Tests.Integration.Testing
private void RebuildSchemaFirstTime(TestDbMeta meta)
{
_databaseFactory.Configure(meta.ConnectionString, Core.Constants.DatabaseProviders.SqlServer);
_databaseFactory.Configure(meta.ConnectionString, Constants.DatabaseProviders.SqlServer);
using (var database = (UmbracoDatabase)_databaseFactory.CreateDatabase())
{

View File

@@ -1,7 +1,7 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
public interface ITestDatabase
{

View File

@@ -3,10 +3,9 @@
using Examine;
using Examine.LuceneEngine.Providers;
using Umbraco.Core.Composing;
using Umbraco.Examine;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
/// <summary>
/// A component to customize some services to work nicely with integration tests

View File

@@ -9,7 +9,7 @@ using System.Threading;
using Microsoft.Extensions.Logging;
using Umbraco.Core.Persistence;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
/// <summary>
/// Manages a pool of LocalDb databases for integration testing

View File

@@ -3,7 +3,6 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Threading;
@@ -11,7 +10,7 @@ using Microsoft.Extensions.Logging;
using Umbraco.Core.Persistence;
// ReSharper disable ConvertToUsingDeclaration
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
/// <remarks>
/// It's not meant to be pretty, rushed port of LocalDb.cs + LocalDbTestDatabase.cs

View File

@@ -6,7 +6,7 @@ using System.IO;
using Microsoft.Extensions.Logging;
using Umbraco.Core.Persistence;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
public class TestDatabaseFactory
{

View File

@@ -1,5 +1,5 @@
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
public class TestDatabaseSettings
{

View File

@@ -3,7 +3,7 @@
using System.Text.RegularExpressions;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
public class TestDbMeta
{

View File

@@ -4,12 +4,12 @@
using System;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Core.Configuration.Models;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
/// <summary>
/// I want to be able to create a database for integration testsing without setting the connection string on the

View File

@@ -18,30 +18,28 @@ using Microsoft.Extensions.Options;
using Moq;
using NUnit.Framework;
using Serilog;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.IO;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.DependencyInjection;
using Umbraco.Cms.Tests.Integration.Extensions;
using Umbraco.Cms.Tests.Integration.Implementations;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Runtime;
using Umbraco.Core.Scoping;
using Umbraco.Core.Strings;
using Umbraco.Extensions;
using Umbraco.Infrastructure.DependencyInjection;
using Umbraco.Infrastructure.PublishedCache.DependencyInjection;
using Umbraco.Tests.Common.Builders;
using Umbraco.Tests.Integration.DependencyInjection;
using Umbraco.Tests.Integration.Extensions;
using Umbraco.Tests.Integration.Implementations;
using Umbraco.Tests.Integration.TestServerTest;
using Umbraco.Tests.Testing;
using Umbraco.Web;
using Umbraco.Web.BackOffice.DependencyInjection;
using Umbraco.Web.Common.DependencyInjection;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
/// <summary>
/// Abstract class for integration tests
@@ -200,7 +198,7 @@ namespace Umbraco.Tests.Integration.Testing
services.AddRequiredNetCoreServices(TestHelper, webHostEnvironment);
// Add it!
Core.Composing.TypeLoader typeLoader = services.AddTypeLoader(
TypeLoader typeLoader = services.AddTypeLoader(
GetType().Assembly,
webHostEnvironment,
TestHelper.GetHostingEnvironment(),

View File

@@ -3,12 +3,12 @@
using System;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Core.Services.Implement;
using Umbraco.Tests.Common.Builders;
namespace Umbraco.Tests.Integration.Testing
namespace Umbraco.Cms.Tests.Integration.Testing
{
public abstract class UmbracoIntegrationTestWithContent : UmbracoIntegrationTest
{