From b74abaf3af8f706346e895583469c5cb08d22a25 Mon Sep 17 00:00:00 2001 From: Mole Date: Fri, 12 Feb 2021 10:41:07 +0100 Subject: [PATCH] Align namespaces in DependencyInjection to Umbraco.Cms.Infrastructure.DependencyInjection Even though Core also has this, then pretty much every project has their own DI namespace, and this one does reference third party dependencies as far as I can see --- .../DependencyInjection/UmbracoBuilder.Collections.cs | 2 +- .../DependencyInjection/UmbracoBuilder.CoreServices.cs | 2 +- .../DependencyInjection/UmbracoBuilder.DistributedCache.cs | 2 +- .../DependencyInjection/UmbracoBuilder.FileSystems.cs | 2 +- .../DependencyInjection/UmbracoBuilder.Installer.cs | 2 +- .../DependencyInjection/UmbracoBuilder.MappingProfiles.cs | 2 +- .../DependencyInjection/UmbracoBuilder.Repositories.cs | 2 +- .../DependencyInjection/UmbracoBuilder.Services.cs | 2 +- .../DependencyInjection/UmbracoBuilder.Uniques.cs | 2 +- src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs | 2 +- src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs | 2 +- src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 2 +- .../DependencyInjection/UmbracoBuilderExtensions.cs | 2 +- .../DependencyInjection/UmbracoBuilderExtensions.cs | 2 +- .../DependencyInjection/UmbracoBuilderExtensions.cs | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs index f06ed4b92c..5920caa9ca 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs @@ -1,7 +1,7 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Core.Persistence.Mappers; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs index 89a337ce0f..1f78a7716b 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs @@ -52,7 +52,7 @@ using Umbraco.Web.PropertyEditors.ValueConverters; using Umbraco.Web.Routing; using Umbraco.Web.Search; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { public static partial class UmbracoBuilderExtensions { diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs index b6946b49da..942ddf69ae 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Sync; using Umbraco.Extensions; using Umbraco.Web.Search; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.FileSystems.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.FileSystems.cs index 262a84d11a..b00b9a4985 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.FileSystems.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.FileSystems.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.IO.MediaPathSchemes; using Umbraco.Extensions; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { public static partial class UmbracoBuilderExtensions { diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs index 6e2b5020a2..6823cf8681 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs @@ -6,7 +6,7 @@ using Umbraco.Extensions; using Umbraco.Web.Install; using Umbraco.Web.Install.InstallSteps; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { public static partial class UmbracoBuilderExtensions { diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs index 0f0ecc21f9..837055e6c1 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs @@ -6,7 +6,7 @@ using Umbraco.Core.Security; using Umbraco.Extensions; using Umbraco.Web.Models.Mapping; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { public static partial class UmbracoBuilderExtensions { diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs index 4a01093b1a..96ba4e9c91 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs @@ -4,7 +4,7 @@ using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Extensions; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { /// /// Composes repositories. diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs index c5cf642140..cbfb34c7fe 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs @@ -18,7 +18,7 @@ using Umbraco.Core.Services.Implement; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { public static partial class UmbracoBuilderExtensions { diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs index de94f7ed68..ddbf4ceca1 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Core.Logging.Viewer; using Umbraco.Extensions; -namespace Umbraco.Infrastructure.DependencyInjection +namespace Umbraco.Cms.Infrastructure.DependencyInjection { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs index 9206f87394..7cc4dd1077 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs @@ -4,8 +4,8 @@ using Serilog; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Logging; +using Umbraco.Cms.Infrastructure.DependencyInjection; using Umbraco.Extensions; -using Umbraco.Infrastructure.DependencyInjection; namespace Umbraco.Core.Logging.Viewer { diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs index 4430f16533..44110e2756 100644 --- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs +++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs @@ -27,6 +27,7 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Infrastructure.DependencyInjection; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; using Umbraco.Cms.Tests.Integration.DependencyInjection; @@ -36,7 +37,6 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Scoping; using Umbraco.Extensions; -using Umbraco.Infrastructure.DependencyInjection; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Tests.Integration.Testing diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index c4e3ebaf9b..b4dfaf6926 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -47,6 +47,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.DependencyInjection; using Umbraco.Cms.Tests.Common; using Umbraco.Cms.Tests.Common.Testing; using Umbraco.Core; @@ -60,7 +61,6 @@ using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Infrastructure.DependencyInjection; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web; diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs index 4baf6a29f5..ac051b21c8 100644 --- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs @@ -8,6 +8,7 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Infrastructure.DependencyInjection; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.Middleware; @@ -16,7 +17,6 @@ using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Cms.Web.BackOffice.Services; using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Cms.Web.Common.Authorization; -using Umbraco.Infrastructure.DependencyInjection; using Umbraco.Web.WebAssets; namespace Umbraco.Extensions diff --git a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs index 067c55225f..85a10af447 100644 --- a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs @@ -31,6 +31,7 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Infrastructure.DependencyInjection; using Umbraco.Cms.Web.Common; using Umbraco.Cms.Web.Common.ApplicationModels; using Umbraco.Cms.Web.Common.AspNetCore; @@ -49,7 +50,6 @@ using Umbraco.Cms.Web.Common.UmbracoContext; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Infrastructure.DependencyInjection; using Umbraco.Infrastructure.HostedServices; using Umbraco.Infrastructure.HostedServices.ServerRegistration; using Umbraco.Web.Telemetry; diff --git a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs index a19800516f..3823cde255 100644 --- a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs @@ -2,12 +2,12 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.DependencyInjection; +using Umbraco.Cms.Infrastructure.DependencyInjection; using Umbraco.Cms.Web.Common.Routing; using Umbraco.Cms.Web.Website.Collections; using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Cms.Web.Website.Routing; using Umbraco.Cms.Web.Website.ViewEngines; -using Umbraco.Infrastructure.DependencyInjection; namespace Umbraco.Extensions {