From bf936cbd65ca6bfc95c2fedd391122e64cbdcab4 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 22 Feb 2021 10:32:09 +0100
Subject: [PATCH] Fix namespaces when building MB models

---
 .../Dashboards}/ModelsBuilderDashboard.cs                     | 3 +--
 src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs  | 2 +-
 .../Umbraco.ModelsBuilder.Embedded/BuilderTests.cs            | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename src/{Umbraco.Infrastructure/ModelsBuilder => Umbraco.Core/Dashboards}/ModelsBuilderDashboard.cs (82%)

diff --git a/src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs b/src/Umbraco.Core/Dashboards/ModelsBuilderDashboard.cs
similarity index 82%
rename from src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs
rename to src/Umbraco.Core/Dashboards/ModelsBuilderDashboard.cs
index 1d84a39891..9ba5c9dd0c 100644
--- a/src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs
+++ b/src/Umbraco.Core/Dashboards/ModelsBuilderDashboard.cs
@@ -1,8 +1,7 @@
 using System;
 using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Dashboards;
 
-namespace Umbraco.Cms.Infrastructure.ModelsBuilder
+namespace Umbraco.Cms.Core.Dashboards
 {
     [Weight(40)]
     public class ModelsBuilderDashboard : IDashboard
diff --git a/src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs b/src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
index 401844117c..27bd6d990a 100644
--- a/src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
+++ b/src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Cms.Infrastructure.ModelsBuilder.Building
             "Umbraco.Cms.Core.Models.PublishedContent",
             "Umbraco.Web.PublishedCache", // Todo: Remove/Edit this once namespaces has been aligned.
             "Umbraco.Cms.Core.PublishedCache",
-            "Umbraco.Cms.ModelsBuilder.Embedded",
+            "Umbraco.Cms.Infrastructure.ModelsBuilder",
             "Umbraco.Cms.Core",
             "Umbraco.Core", // TODO: Remove once namespace is gone, after which BuilderTests needs to be adjusted.
             "Umbraco.Extensions"
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
index 6d1ff92156..8cffb7541a 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
@@ -62,7 +62,7 @@ using System.Linq.Expressions;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.ModelsBuilder.Embedded;
+using Umbraco.Cms.Infrastructure.ModelsBuilder;
 using Umbraco.Cms.Core;
 using Umbraco.Core;
 using Umbraco.Extensions;
@@ -170,7 +170,7 @@ using System.Linq.Expressions;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.ModelsBuilder.Embedded;
+using Umbraco.Cms.Infrastructure.ModelsBuilder;
 using Umbraco.Cms.Core;
 using Umbraco.Core;
 using Umbraco.Extensions;