From 548bf27a0c8f2da72c4de5f7c6d5e980fb934891 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 12 Feb 2021 12:33:52 +0100
Subject: [PATCH] Align namespaces in Media to Umbraco.Cms.Infrastructure

---
 .../DependencyInjection/UmbracoBuilder.CoreServices.cs         | 3 +--
 src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs    | 3 +--
 .../Media/ImageSharpImageUrlGenerator.cs                       | 2 +-
 .../Media/ImageSharpImageUrlGeneratorTests.cs                  | 2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs                   | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
index 91c0d475fa..e5722cabd2 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
@@ -29,6 +29,7 @@ using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Infrastructure.HealthChecks;
 using Umbraco.Cms.Infrastructure.HostedServices;
 using Umbraco.Cms.Infrastructure.Install;
+using Umbraco.Cms.Infrastructure.Media;
 using Umbraco.Core;
 using Umbraco.Core.Migrations;
 using Umbraco.Core.Migrations.Install;
@@ -39,10 +40,8 @@ using Umbraco.Core.Runtime;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Serialization;
 using Umbraco.Extensions;
-using Umbraco.Infrastructure.Media;
 using Umbraco.Infrastructure.Runtime;
 using Umbraco.Web;
-using Umbraco.Web.Media;
 using Umbraco.Web.Migrations.PostMigrations;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Web.PropertyEditors.ValueConverters;
diff --git a/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs b/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs
index 2fd381e6c4..091d3c395b 100644
--- a/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs
+++ b/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs
@@ -2,10 +2,9 @@ using System;
 using System.Drawing;
 using System.IO;
 using Umbraco.Cms.Core.Media;
-using Umbraco.Core;
 using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web.Media
+namespace Umbraco.Cms.Infrastructure.Media
 {
     internal class ImageDimensionExtractor : IImageDimensionExtractor
     {
diff --git a/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs b/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs
index 33a650bdc8..e1bf2c197b 100644
--- a/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs
+++ b/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs
@@ -5,7 +5,7 @@ using Umbraco.Cms.Core.Media;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Extensions;
 
-namespace Umbraco.Infrastructure.Media
+namespace Umbraco.Cms.Infrastructure.Media
 {
     public class ImageSharpImageUrlGenerator : IImageUrlGenerator
     {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs
index b0cd3de9f4..52ee1ed0e4 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Infrastructure.Media;
+using Umbraco.Cms.Infrastructure.Media;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Media
 {
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 2cc31ab28e..5f36158434 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -48,6 +48,7 @@ using Umbraco.Cms.Core.Templates;
 using Umbraco.Cms.Core.Trees;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure.DependencyInjection;
+using Umbraco.Cms.Infrastructure.Media;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Core;
@@ -65,7 +66,6 @@ using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Hosting;
-using Umbraco.Web.Media;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Web.Security;
 using Umbraco.Web.Security.Providers;