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

Fix Merge

Browse Source
This commit is contained in:
Mole
2021-02-22 15:46:46 +01:00
parent 405d0e704d
commit 8f21fb5492
6 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardProvider.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Routing;
using Umbraco.Cms.Web.Common.ModelsBuilder;
using Umbraco.Extensions;
using Umbraco.Web.Common.ModelsBuilder;
namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder
{

2
src/Umbraco.Web.BackOffice/ModelsBuilder/UmbracoBuilderExtensions.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Web.Common.ModelsBuilder;
using Umbraco.Extensions;
using Umbraco.Web.Common.ModelsBuilder;
namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder
{

1
src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
View File

@@ -13,7 +13,6 @@ using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
using Umbraco.Cms.Infrastructure.WebAssets;
using Umbraco.Cms.Web.Common.ModelBinders;
using Umbraco.Cms.Web.Common.ModelsBuilder;
using Umbraco.Web.Common.ModelsBuilder;
/*
* OVERVIEW:

3
src/Umbraco.Web.Common/ModelsBuilder/IModelsBuilderDashboardProvider.cs
View File

@@ -3,9 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Umbraco.Web.Routing;
namespace Umbraco.Web.Common.ModelsBuilder
namespace Umbraco.Cms.Web.Common.ModelsBuilder
{
public interface IModelsBuilderDashboardProvider
{

1
src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
View File

@@ -13,7 +13,6 @@ using Umbraco.Cms.Infrastructure.ModelsBuilder;
using Umbraco.Cms.Infrastructure.Services.Implement;
using Umbraco.Cms.Infrastructure.WebAssets;
using Umbraco.Cms.Web.Common.ModelBinders;
using Umbraco.Web.Common.ModelsBuilder;
namespace Umbraco.Cms.Web.Common.ModelsBuilder
{

2
src/Umbraco.Web.Common/ModelsBuilder/NoopModelsBuilderDashboardProvider.cs
View File

@@ -1,4 +1,4 @@
namespace Umbraco.Web.Common.ModelsBuilder
namespace Umbraco.Cms.Web.Common.ModelsBuilder
{
public class NoopModelsBuilderDashboardProvider: IModelsBuilderDashboardProvider
{