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

Rename Umbraco.Core namespace to Umbraco.Cms.Core

Browse Source
This commit is contained in:
Mole
2021-02-09 10:22:42 +01:00
parent b0b1de9972
commit 216fb87c79
2949 changed files with 9097 additions and 6810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs
View File

@@ -5,9 +5,12 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Web.Routing;
namespace Umbraco.Web.Website.ActionResults

1
src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoUrlResult.cs
View File

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.Web;
namespace Umbraco.Web.Website.ActionResults
{

3
src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs
View File

@@ -5,11 +5,12 @@ using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.Logging;
using Umbraco.Core.Logging;
using Umbraco.Web.Common.Routing;
using Umbraco.Web.Website.Controllers;
using Umbraco.Web.Website.Routing;
using static Umbraco.Core.Constants.Web.Routing;
using static Umbraco.Cms.Core.Constants.Web.Routing;
namespace Umbraco.Web.Website.ActionResults
{

2
src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollection.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Web.Website.Collections
{

2
src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollectionBuilder.cs
View File

@@ -1,4 +1,4 @@
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
using Umbraco.Web.Website.Controllers;
namespace Umbraco.Web.Website.Collections

5
src/Umbraco.Web.Website/Controllers/RenderNoContentController.cs
View File

@@ -1,8 +1,9 @@
using System;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.IO;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Web;
using Umbraco.Web.Website.Models;
namespace Umbraco.Web.Website.Controllers

7
src/Umbraco.Web.Website/Controllers/SurfaceController.cs
View File

@@ -2,10 +2,15 @@ using System;
using System.Collections.Specialized;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Persistence;
using Umbraco.Core.Services;
using Umbraco.Web.Common.Controllers;

9
src/Umbraco.Web.Website/Controllers/UmbLoginController.cs
View File

@@ -1,9 +1,16 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.Security;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Models.Security;
using Umbraco.Core.Persistence;
using Umbraco.Core.Security;
using Umbraco.Core.Services;

9
src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs
View File

@@ -1,9 +1,16 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.Security;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Models.Security;
using Umbraco.Core.Persistence;
using Umbraco.Core.Security;
using Umbraco.Core.Services;

9
src/Umbraco.Web.Website/Controllers/UmbProfileController.cs
View File

@@ -1,10 +1,17 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.Security;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Models.Security;
using Umbraco.Core.Persistence;
using Umbraco.Core.Security;
using Umbraco.Core.Services;

9
src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs
View File

@@ -1,10 +1,17 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.Security;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Models.Security;
using Umbraco.Core.Persistence;
using Umbraco.Core.Security;
using Umbraco.Core.Services;

2
src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Umbraco.Core.DependencyInjection;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Extensions;
using Umbraco.Infrastructure.DependencyInjection;
using Umbraco.ModelsBuilder.Embedded.DependencyInjection;

12
src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs
View File

@@ -13,17 +13,21 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Core.Web.Mvc;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Web;
using Umbraco.Web.Common.Controllers;
using Umbraco.Web.Common.Mvc;
using Umbraco.Web.Common.Security;
using Umbraco.Web.Mvc;
using Umbraco.Web.Website.Collections;
using Umbraco.Web.Website.Controllers;

1
src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using Microsoft.AspNetCore.Routing;
using Umbraco.Cms.Core;
using Umbraco.Core;
using Umbraco.Web.Website.Controllers;

7
src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs
View File

@@ -3,11 +3,16 @@ using System.Collections.Generic;
using System.Web;
using Examine;
using Microsoft.AspNetCore.Html;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Services;
using Umbraco.Examine;
using Umbraco.Web.Routing;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Website.Extensions
{

2
src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
using Umbraco.Web.Common.Controllers;
using Umbraco.Web.Website.Controllers;

4
src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs
View File

@@ -5,9 +5,9 @@ using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Logging;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
using Umbraco.Web.Common.Controllers;
using static Umbraco.Core.Constants.Web.Routing;
using static Umbraco.Cms.Core.Constants.Web.Routing;
namespace Umbraco.Web.Website.Routing
{

10
src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs
View File

@@ -5,15 +5,17 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web.Mvc;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Web.Common.Controllers;
using Umbraco.Web.Common.Extensions;
using Umbraco.Web.Common.Routing;
using Umbraco.Web.Mvc;
using Umbraco.Web.WebApi;
using Umbraco.Web.Website.Collections;
namespace Umbraco.Web.Website.Routing

1
src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs
View File

@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Umbraco.Cms.Core.Routing;
using Umbraco.Web.Common.Routing;
using Umbraco.Web.Routing;

12
src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs
View File

@@ -12,16 +12,20 @@ using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Primitives;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Extensions;
using Umbraco.Web.Common.Routing;
using Umbraco.Web.Common.Security;
using Umbraco.Web.Routing;
using Umbraco.Web.Website.Controllers;
using static Umbraco.Core.Constants.Web.Routing;
using RouteDirection = Umbraco.Web.Routing.RouteDirection;
using static Umbraco.Cms.Core.Constants.Web.Routing;
using RouteDirection = Umbraco.Cms.Core.Routing.RouteDirection;
namespace Umbraco.Web.Website.Routing
{

9
src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs
View File

@@ -2,12 +2,15 @@ using System;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Routing;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Features;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Strings;
using Umbraco.Core;
using Umbraco.Core.Strings;
using Umbraco.Extensions;
using Umbraco.Web.Common.Controllers;
using Umbraco.Web.Common.Routing;
using Umbraco.Web.Features;
using Umbraco.Web.Routing;
using Umbraco.Web.Website.Controllers;
@@ -142,7 +145,7 @@ namespace Umbraco.Web.Website.Routing
&& !_umbracoFeatures.Disabled.DisableTemplates
&& !def.HasHijackedRoute)
{
Core.Models.PublishedContent.IPublishedContent content = request.PublishedContent;
IPublishedContent content = request.PublishedContent;
// This is basically a 404 even if there is content found.
// We then need to re-run this through the pipeline for the last

9
src/Umbraco.Web.Website/Security/UmbracoWebsiteSecurity.cs
View File

@@ -5,13 +5,18 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Http;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Security;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Security;
using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Web.Models;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Website.Security
{

9
src/Umbraco.Web.Website/ViewEngines/PluginRazorViewEngineOptionsSetup.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Mvc.Razor;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core;
namespace Umbraco.Web.Website.ViewEngines
{
@@ -32,12 +33,12 @@ namespace Umbraco.Web.Website.ViewEngines
string[] umbViewLocations = new string[]
{
// area view locations for the plugin folder
string.Concat(Core.Constants.SystemDirectories.AppPlugins, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Core.Constants.SystemDirectories.AppPlugins, "/{2}/Views/Shared/{0}.cshtml"),
string.Concat(Constants.SystemDirectories.AppPlugins, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Constants.SystemDirectories.AppPlugins, "/{2}/Views/Shared/{0}.cshtml"),
// will be used when we have partial view and child action macros
string.Concat(Core.Constants.SystemDirectories.AppPlugins, "/{2}/Views/Partials/{0}.cshtml"),
string.Concat(Core.Constants.SystemDirectories.AppPlugins, "/{2}/Views/MacroPartials/{0}.cshtml")
string.Concat(Constants.SystemDirectories.AppPlugins, "/{2}/Views/Partials/{0}.cshtml"),
string.Concat(Constants.SystemDirectories.AppPlugins, "/{2}/Views/MacroPartials/{0}.cshtml")
};
viewLocations = umbViewLocations.Concat(viewLocations);

1
src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngine.cs
View File

@@ -1,6 +1,7 @@

using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ViewEngines;
using Umbraco.Cms.Core.Logging;
using Umbraco.Core.Logging;
namespace Umbraco.Web.Website.ViewEngines

1
src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngineWrapperMvcViewOptionsSetup.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ViewEngines;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Logging;
using Umbraco.Core.Logging;
namespace Umbraco.Web.Website.ViewEngines