From eb091f8dcdb2aa0f979fa9594b4d307fc721a3d1 Mon Sep 17 00:00:00 2001 From: Mole Date: Mon, 15 Feb 2021 13:14:07 +0100 Subject: [PATCH] Align namespaces in root of infrastructure --- .../DependencyInjection/UmbracoBuilder.CoreServices.cs | 1 - src/Umbraco.Infrastructure/EmailSender.cs | 2 +- .../{ => Extensions}/ObjectJsonExtensions.cs | 7 +------ .../HostedServices/ScheduledPublishing.cs | 1 - src/Umbraco.Infrastructure/IPublishedContentQuery.cs | 8 +------- src/Umbraco.Infrastructure/PublishedContentQuery.cs | 2 +- .../Routing/ContentFinderByConfigured404.cs | 2 +- .../Routing/NotFoundHandlerHelper.cs | 1 - src/Umbraco.Infrastructure/RuntimeState.cs | 2 +- src/Umbraco.Infrastructure/Search/ExamineComponent.cs | 1 - src/Umbraco.Infrastructure/Suspendable.cs | 2 +- src/Umbraco.Infrastructure/TagQuery.cs | 2 +- src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs | 1 + .../Umbraco.Core/ReflectionUtilitiesTests.cs | 2 +- .../HostedServices/ScheduledPublishingTests.cs | 2 +- .../Controllers/SurfaceControllerTests.cs | 1 - .../PublishedContent/PublishedContentMoreTests.cs | 1 + src/Umbraco.Tests/TestHelpers/TestHelper.cs | 1 + src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 1 + src/Umbraco.Tests/Web/PublishedContentQueryTests.cs | 1 + .../Controllers/BackOfficeServerVariables.cs | 1 + .../Controllers/EntityController.cs | 1 - .../Controllers/TemplateQueryController.cs | 2 +- src/Umbraco.Web.BackOffice/Controllers/UsersController.cs | 1 + src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs | 1 + src/Umbraco.Web.Common/UmbracoHelper.cs | 1 - .../umbraco/PartialViewMacros/Templates/Gallery.cshtml | 1 - .../Templates/ListChildPagesFromChangeableSource.cshtml | 1 - .../Templates/ListImagesFromMediaFolder.cshtml | 2 +- .../Extensions/PublishedContentExtensions.cs | 1 - 30 files changed, 20 insertions(+), 33 deletions(-) rename src/Umbraco.Infrastructure/{ => Extensions}/ObjectJsonExtensions.cs (91%) diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs index c77dd1a50f..531cad03b5 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs @@ -42,7 +42,6 @@ using Umbraco.Cms.Infrastructure.Serialization; using Umbraco.Core; using Umbraco.Core.Packaging; using Umbraco.Extensions; -using Umbraco.Web; namespace Umbraco.Cms.Infrastructure.DependencyInjection { diff --git a/src/Umbraco.Infrastructure/EmailSender.cs b/src/Umbraco.Infrastructure/EmailSender.cs index 4863ed3fc5..fe18301295 100644 --- a/src/Umbraco.Infrastructure/EmailSender.cs +++ b/src/Umbraco.Infrastructure/EmailSender.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Core.Mail; using Umbraco.Cms.Core.Models; using SmtpClient = MailKit.Net.Smtp.SmtpClient; -namespace Umbraco.Core +namespace Umbraco.Cms.Infrastructure { /// /// A utility class for sending emails diff --git a/src/Umbraco.Infrastructure/ObjectJsonExtensions.cs b/src/Umbraco.Infrastructure/Extensions/ObjectJsonExtensions.cs similarity index 91% rename from src/Umbraco.Infrastructure/ObjectJsonExtensions.cs rename to src/Umbraco.Infrastructure/Extensions/ObjectJsonExtensions.cs index 0ab1f8c6fd..40960cdbb7 100644 --- a/src/Umbraco.Infrastructure/ObjectJsonExtensions.cs +++ b/src/Umbraco.Infrastructure/Extensions/ObjectJsonExtensions.cs @@ -1,17 +1,12 @@ using System; -using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; -using System.ComponentModel; using System.Linq; -using System.Linq.Expressions; using System.Reflection; -using System.Runtime.CompilerServices; -using System.Xml; using Newtonsoft.Json; using Umbraco.Cms.Core; -namespace Umbraco.Core +namespace Umbraco.Extensions { /// /// Provides object extension methods. diff --git a/src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs b/src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs index 55e5f12c94..bc81bfabcf 100644 --- a/src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs +++ b/src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs @@ -12,7 +12,6 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; -using Umbraco.Web; namespace Umbraco.Cms.Infrastructure.HostedServices { diff --git a/src/Umbraco.Infrastructure/IPublishedContentQuery.cs b/src/Umbraco.Infrastructure/IPublishedContentQuery.cs index f013a3a5e0..e487873ab2 100644 --- a/src/Umbraco.Infrastructure/IPublishedContentQuery.cs +++ b/src/Umbraco.Infrastructure/IPublishedContentQuery.cs @@ -2,22 +2,16 @@ using System.Collections.Generic; using System.Xml.XPath; using Examine.Search; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web +namespace Umbraco.Cms.Core { /// /// Query methods used for accessing strongly typed content in templates /// public interface IPublishedContentQuery { - - - IPublishedContent Content(int id); IPublishedContent Content(Guid id); IPublishedContent Content(Udi id); diff --git a/src/Umbraco.Infrastructure/PublishedContentQuery.cs b/src/Umbraco.Infrastructure/PublishedContentQuery.cs index 1d6b1a31d9..1d13748aeb 100644 --- a/src/Umbraco.Infrastructure/PublishedContentQuery.cs +++ b/src/Umbraco.Infrastructure/PublishedContentQuery.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web +namespace Umbraco.Cms.Infrastructure { /// /// A class used to query for published content, media items diff --git a/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs index d7f45c3d4d..ef392f1644 100644 --- a/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs +++ b/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Web; +using Umbraco.Cms.Infrastructure; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs index 837f5a57a4..85a27af0e8 100644 --- a/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs +++ b/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs @@ -8,7 +8,6 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Xml; using Umbraco.Extensions; -using Umbraco.Web; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Infrastructure/RuntimeState.cs b/src/Umbraco.Infrastructure/RuntimeState.cs index 12611e3068..6a502a9298 100644 --- a/src/Umbraco.Infrastructure/RuntimeState.cs +++ b/src/Umbraco.Infrastructure/RuntimeState.cs @@ -12,7 +12,7 @@ using Umbraco.Cms.Infrastructure.Migrations.Install; using Umbraco.Cms.Infrastructure.Migrations.Upgrade; using Umbraco.Cms.Infrastructure.Persistence; -namespace Umbraco.Core +namespace Umbraco.Cms.Core { /// /// Represents the state of the Umbraco runtime. diff --git a/src/Umbraco.Infrastructure/Search/ExamineComponent.cs b/src/Umbraco.Infrastructure/Search/ExamineComponent.cs index 0bffa51b7a..3d85c66755 100644 --- a/src/Umbraco.Infrastructure/Search/ExamineComponent.cs +++ b/src/Umbraco.Infrastructure/Search/ExamineComponent.cs @@ -16,7 +16,6 @@ using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Extensions; -using Umbraco.Web; namespace Umbraco.Cms.Infrastructure.Search { diff --git a/src/Umbraco.Infrastructure/Suspendable.cs b/src/Umbraco.Infrastructure/Suspendable.cs index 79482f282e..73798f8cf1 100644 --- a/src/Umbraco.Infrastructure/Suspendable.cs +++ b/src/Umbraco.Infrastructure/Suspendable.cs @@ -4,7 +4,7 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Cms.Infrastructure.Search; -namespace Umbraco.Web +namespace Umbraco.Cms.Infrastructure { internal static class Suspendable { diff --git a/src/Umbraco.Infrastructure/TagQuery.cs b/src/Umbraco.Infrastructure/TagQuery.cs index 44cc983a8a..ea2e41005d 100644 --- a/src/Umbraco.Infrastructure/TagQuery.cs +++ b/src/Umbraco.Infrastructure/TagQuery.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; -namespace Umbraco.Web +namespace Umbraco.Cms.Core { /// /// Implements . diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs index 15b8db1249..fd27817475 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs @@ -32,6 +32,7 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.Persistence; using Umbraco.Cms.Infrastructure.Persistence.Mappers; using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs index 5545b471c6..853adddef4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs @@ -8,7 +8,7 @@ using System.Reflection; using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs index af1df64c79..62ee1fdd29 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs @@ -11,8 +11,8 @@ using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.HostedServices; -using Umbraco.Web; namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs index 869fb7046b..bb85ae4620 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs @@ -22,7 +22,6 @@ using Umbraco.Cms.Tests.Common.Testing; using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects; using Umbraco.Cms.Web.Common.Routing; using Umbraco.Cms.Web.Website.Controllers; -using Umbraco.Web; namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs index 97d0c3adbc..b592e9630d 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs @@ -7,6 +7,7 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Tests.Common.Testing; using Umbraco.Extensions; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs index 4fa7ae5f63..f666534410 100644 --- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs +++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs @@ -32,6 +32,7 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.Migrations.Install; using Umbraco.Cms.Infrastructure.Persistence; using Umbraco.Cms.Persistence.SqlCe; diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index cbcde0a6f1..eab422e4eb 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -48,6 +48,7 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.DependencyInjection; using Umbraco.Cms.Infrastructure.Media; using Umbraco.Cms.Infrastructure.Migrations.Install; diff --git a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs index cc6218dcba..cc34cd4aba 100644 --- a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs +++ b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs @@ -8,6 +8,7 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Tests.TestHelpers; using Umbraco.Web; diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs index 5d874a9ce3..76328bee5a 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs @@ -16,6 +16,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Web.BackOffice.HealthChecks; using Umbraco.Cms.Web.BackOffice.Profiling; using Umbraco.Cms.Web.BackOffice.PropertyEditors; diff --git a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs index 404c135bd8..a6bf0a189a 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs @@ -24,7 +24,6 @@ using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs b/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs index efbbb2cd9d..9183c8c9ed 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Models.TemplateQuery; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs index 0ce036842c..fbe422acb6 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs @@ -29,6 +29,7 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.Persistence; using Umbraco.Cms.Web.BackOffice.ActionResults; using Umbraco.Cms.Web.BackOffice.Extensions; diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs index 3eca0b590d..19018f8add 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs @@ -16,6 +16,7 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.Search; using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Cms.Web.Common.Authorization; diff --git a/src/Umbraco.Web.Common/UmbracoHelper.cs b/src/Umbraco.Web.Common/UmbracoHelper.cs index 4ed59a00e0..266f719a8b 100644 --- a/src/Umbraco.Web.Common/UmbracoHelper.cs +++ b/src/Umbraco.Web.Common/UmbracoHelper.cs @@ -9,7 +9,6 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Xml; using Umbraco.Extensions; -using Umbraco.Web; namespace Umbraco.Cms.Web.Common { diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml index d1f109d307..fec760b5cb 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml @@ -2,7 +2,6 @@ @using Umbraco.Cms.Core.Media @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing -@using Umbraco.Web @using Umbraco.Extensions @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml index 8ce5fd7920..464c05fb78 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml @@ -2,7 +2,6 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@using Umbraco.Web @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedContentQuery PublishedContentQuery @inject IPublishedValueFallback PublishedValueFallback diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml index b837cca787..2ef595992d 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml @@ -1,6 +1,6 @@ +@using Umbraco.Cms.Core @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@using Umbraco.Web @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedContentQuery PublishedContentQuery @inject IPublishedUrlProvider PublishedUrlProvider diff --git a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs index a59ccf196e..dbce0fea6f 100644 --- a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs @@ -9,7 +9,6 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Examine; -using Umbraco.Web; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Extensions