yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Netcore: Align namespaces (#9801)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.Common/Extensions/ActionResultExtensions.cs
View File

@@ -1,6 +1,4 @@
using System.Net;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;

13
src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Serilog.Context;
@@ -9,16 +8,16 @@ using SixLabors.ImageSharp.Web.DependencyInjection;
using Smidge;
using Smidge.Nuglify;
using StackExchange.Profiling;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Web.Common.Middleware;
using Umbraco.Cms.Web.Common.Plugins;
using Umbraco.Infrastructure.Logging.Serilog.Enrichers;
using Umbraco.Web.Common.Middleware;
using Umbraco.Web.Common.Plugins;
namespace Umbraco.Extensions
{
/// <summary>
/// <see cref="IApplicationBuilder"/> extensions for Umbraco
/// </summary>

5
src/Umbraco.Web.Common/Extensions/BlockListTemplateExtensions.cs
View File

@@ -1,9 +1,8 @@
using System;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Umbraco.Core.Models.Blocks;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Cms.Core.Models.PublishedContent;
namespace Umbraco.Extensions
{

7
src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs
View File

@@ -2,12 +2,11 @@
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Umbraco.Core.Cache;
using Umbraco.Core.Hosting;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Hosting;
namespace Umbraco.Extensions
{
/// <summary>
/// Extension methods for the cache helper
/// </summary>
@@ -43,7 +42,7 @@ namespace Umbraco.Extensions
}
return appCaches.RuntimeCache.GetCacheItem<IHtmlContent>(
Core.CacheHelperExtensions.PartialViewCacheKey + cacheKey,
CoreCacheHelperExtensions.PartialViewCacheKey + cacheKey,
() => htmlHelper.Partial(partialViewName, model, viewData),
timeout: new TimeSpan(0, 0, 0, cachedSeconds));
}

11
src/Umbraco.Web.Common/Extensions/ControllerActionEndpointConventionBuilderExtensions.cs
View File

@@ -1,17 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Web.Common.Filters;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Web.Common.Filters;
using Umbraco.Cms.Web.Common.Routing;
namespace Umbraco.Web.Common.Extensions
namespace Umbraco.Extensions
{
public static class ControllerActionEndpointConventionBuilderExtensions
{

5
src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs
View File

@@ -2,14 +2,13 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Core;
namespace Umbraco.Extensions
{
public static class ControllerExtensions
{
/// <summary>
/// Runs the authentication process
/// Runs the authentication process
/// </summary>
/// <param name="controller"></param>
/// <returns></returns>
@@ -20,7 +19,7 @@ namespace Umbraco.Extensions
return AuthenticateResult.NoResult();
}
var result = await controller.HttpContext.AuthenticateAsync(Constants.Security.BackOfficeAuthenticationType);
var result = await controller.HttpContext.AuthenticateAsync(Cms.Core.Constants.Security.BackOfficeAuthenticationType);
return result;
}

8
src/Umbraco.Web.Common/Extensions/EndpointRouteBuilderExtensions.cs
View File

@@ -3,10 +3,8 @@ using System.Text;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
using NUglify.Helpers;
using Umbraco.Extensions;
namespace Umbraco.Web.Common.Extensions
namespace Umbraco.Extensions
{
public static class EndpointRouteBuilderExtensions
{
@@ -109,8 +107,8 @@ namespace Umbraco.Web.Common.Extensions
{
string prefixPathSegment = isBackOffice
? areaName.IsNullOrWhiteSpace()
? $"{Core.Constants.Web.Mvc.BackOfficePathSegment}/Api"
: $"{Core.Constants.Web.Mvc.BackOfficePathSegment}/{areaName}"
? $"{Cms.Core.Constants.Web.Mvc.BackOfficePathSegment}/Api"
: $"{Cms.Core.Constants.Web.Mvc.BackOfficePathSegment}/{areaName}"
: areaName.IsNullOrWhiteSpace()
? "Api"
: areaName;

1
src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.AspNetCore.Http;
using Umbraco.Core;
namespace Umbraco.Extensions
{

2
src/Umbraco.Web.Common/Extensions/GridTemplateExtensions.cs
View File

@@ -1,7 +1,7 @@
using System;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.Rendering;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Models.PublishedContent;
namespace Umbraco.Extensions
{

9
src/Umbraco.Web.Common/Extensions/HttpContextExtensions.cs
View File

@@ -1,11 +1,8 @@
using Microsoft.AspNetCore.Http;
using System;
using System.Collections.Generic;
using System;
using System.Security.Claims;
using System.Security.Principal;
using System.Text;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Umbraco.Core.Security;
using Umbraco.Cms.Core.Security;
namespace Umbraco.Extensions
{

5
src/Umbraco.Web.Common/Extensions/HttpRequestExtensions.cs
View File

@@ -4,8 +4,7 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Core;
using Umbraco.Core.Routing;
using Umbraco.Cms.Core.Routing;
namespace Umbraco.Extensions
{
@@ -18,7 +17,7 @@ namespace Umbraco.Extensions
/// Check if a preview cookie exist
/// </summary>
public static bool HasPreviewCookie(this HttpRequest request)
=> request.Cookies.TryGetValue(Constants.Web.PreviewCookieName, out var cookieVal) && !cookieVal.IsNullOrWhiteSpace();
=> request.Cookies.TryGetValue(Cms.Core.Constants.Web.PreviewCookieName, out var cookieVal) && !cookieVal.IsNullOrWhiteSpace();
/// <summary>
/// Returns true if the request is a back office request

14
src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs
View File

@@ -1,13 +1,11 @@
using System;
using Newtonsoft.Json.Linq;
using System.Globalization;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.PublishedContent;
using Newtonsoft.Json.Linq;
using Umbraco.Cms.Core.Media;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Routing;
using Umbraco.Core.PropertyEditors.ValueConverters;
using Umbraco.Web.Models;
using Umbraco.Core.Media;
using Umbraco.Web.Routing;
namespace Umbraco.Extensions
{
@@ -131,7 +129,7 @@ namespace Umbraco.Extensions
IPublishedUrlProvider publishedUrlProvider,
int? width = null,
int? height = null,
string propertyAlias = Constants.Conventions.Media.File,
string propertyAlias = Cms.Core.Constants.Conventions.Media.File,
string cropAlias = null,
int? quality = null,
ImageCropMode? imageCropMode = null,

6
src/Umbraco.Web.Common/Extensions/ImageCropperTemplateExtensions.cs
View File

@@ -1,9 +1,9 @@
using System;
using System.Globalization;
using Newtonsoft.Json;
using Umbraco.Core;
using Umbraco.Core.PropertyEditors.ValueConverters;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Umbraco.Cms.Core;
using Umbraco.Core.PropertyEditors.ValueConverters;
namespace Umbraco.Extensions
{

16
src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs
View File

@@ -6,11 +6,11 @@ using System.Linq.Expressions;
using System.Reflection;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
using Umbraco.Core;
using Umbraco.Core.Hosting;
using Umbraco.Web.Common.Controllers;
using Umbraco.Web.Common.Install;
using Umbraco.Web.Mvc;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Web.Mvc;
using Umbraco.Cms.Web.Common.Controllers;
using Umbraco.Cms.Web.Common.Install;
namespace Umbraco.Extensions
{
@@ -36,14 +36,14 @@ namespace Umbraco.Extensions
return hostingEnvironment.ApplicationVirtualPath; // this would indicate that the installer is installed without the back office
}
return linkGenerator.GetPathByAction("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), values: new { area = Constants.Web.Mvc.BackOfficeApiArea });
return linkGenerator.GetPathByAction("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), values: new { area = Cms.Core.Constants.Web.Mvc.BackOfficeApiArea });
}
/// <summary>
/// Returns the URL for the installer
/// </summary>
public static string GetInstallerUrl(this LinkGenerator linkGenerator)
=> linkGenerator.GetPathByAction(nameof(InstallController.Index), ControllerExtensions.GetControllerName<InstallController>(), new { area = Constants.Web.Mvc.InstallArea });
=> linkGenerator.GetPathByAction(nameof(InstallController.Index), ControllerExtensions.GetControllerName<InstallController>(), new { area = Cms.Core.Constants.Web.Mvc.InstallArea });
/// <summary>
/// Returns the URL for the installer api
@@ -52,7 +52,7 @@ namespace Umbraco.Extensions
=> linkGenerator.GetPathByAction(
nameof(InstallApiController.GetSetup),
ControllerExtensions.GetControllerName<InstallApiController>(),
new { area = Constants.Web.Mvc.InstallArea }).TrimEnd(nameof(InstallApiController.GetSetup));
new { area = Cms.Core.Constants.Web.Mvc.InstallArea }).TrimEnd(nameof(InstallApiController.GetSetup));
/// <summary>
/// Return the Url for a Web Api service

5
src/Umbraco.Web.Common/Extensions/TypeLoaderExtensions.cs
View File

@@ -1,8 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using Umbraco.Core.Composing;
using Umbraco.Web.Common.Controllers;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Web.Common.Controllers;
namespace Umbraco.Extensions
{

17
src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
View File

@@ -7,22 +7,17 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Serilog;
using Serilog.Extensions.Hosting;
using Umbraco.Core.Cache;
using Umbraco.Core.Composing;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Logging;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Logging;
using Umbraco.Core.Logging.Serilog;
using Umbraco.Core.Runtime;
using Umbraco.Web.Common.AspNetCore;
using Umbraco.Web.Common.Profiler;
using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment;
using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
namespace Umbraco.Extensions
{
public static class UmbracoCoreServiceCollectionExtensions
{
/// <summary>
/// Create and configure the logger
/// </summary>
@@ -74,7 +69,7 @@ namespace Umbraco.Extensions
IProfilingLogger profilingLogger)
{
var typeFinderSettings = config.GetSection(Core.Constants.Configuration.ConfigTypeFinder).Get<TypeFinderSettings>() ?? new TypeFinderSettings();
var typeFinderSettings = config.GetSection(Cms.Core.Constants.Configuration.ConfigTypeFinder).Get<TypeFinderSettings>() ?? new TypeFinderSettings();
var runtimeHashPaths = new RuntimeHashPaths().AddFolder(new DirectoryInfo(Path.Combine(webHostEnvironment.ContentRootPath, "bin")));
var runtimeHash = new RuntimeHash(profilingLogger, runtimeHashPaths);

2
src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Web.Common.Install;
using Umbraco.Cms.Web.Common.Install;
namespace Umbraco.Extensions
{

17
src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs
View File

@@ -4,21 +4,16 @@ using System.Linq;
using System.Linq.Expressions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Hosting;
using Umbraco.Core.WebAssets;
using Umbraco.Web.Common.Controllers;
using Umbraco.Web.WebApi;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.WebAssets;
using Umbraco.Cms.Web.Common.Controllers;
namespace Umbraco.Extensions
{
public static class UrlHelperExtensions
{
/// <summary>
/// Return the back office url if the back office is installed
/// </summary>
@@ -28,7 +23,7 @@ namespace Umbraco.Extensions
{
var backOfficeControllerType = Type.GetType("Umbraco.Web.BackOffice.Controllers");
if (backOfficeControllerType == null) return "/"; // this would indicate that the installer is installed without the back office
return url.Action("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), new { area = Constants.Web.Mvc.BackOfficeApiArea });
return url.Action("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), new { area = Cms.Core.Constants.Web.Mvc.BackOfficeApiArea });
}
/// <summary>

8
src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs
View File

@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Semver;
using Umbraco.Core;
using Umbraco.Core.Security;
using Umbraco.Core.Serialization;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Semver;
using Umbraco.Cms.Core.Serialization;
namespace Umbraco.Extensions
{