From 24a56882cd49fa8c8cc12c219abd3ec9ca8e3c6f Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 9 Feb 2021 15:39:00 +0100
Subject: [PATCH] Reflect changed namespaces in Builder and fix unit tests

---
 src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs    | 2 +-
 .../Building/TextBuilder.cs                               | 2 +-
 .../Umbraco.Core/CoreThings/UdiTests.cs                   | 4 ++--
 .../Umbraco.ModelsBuilder.Embedded/BuilderTests.cs        | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
index 2b1719cf0b..a4d0787ed5 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
@@ -33,7 +33,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             "Umbraco.Core.Models.PublishedContent",
             "Umbraco.Web.PublishedCache",
             "Umbraco.ModelsBuilder.Embedded",
-            "Umbraco.Core"
+            "Umbraco.Cms.Core"
         };
 
         /// <summary>
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
index 40736ac0f9..e0c0583727 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
@@ -194,7 +194,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             sb.Append("\t\tprivate IPublishedValueFallback _publishedValueFallback;");
 
             // write the ctor
-            sb.AppendFormat("\n\n\t\t// ctor\n\t\tpublic {0}(IPublished{1} content, IPublishedValueFallback publishedValueFallback)\n\t\t\t: base(content)\n\t\t{{\n\t\t\t_publishedValueFallback = publishedValueFallback; \n\t\t}}\n\n",
+            sb.AppendFormat("\n\n\t\t// ctor\n\t\tpublic {0}(IPublished{1} content, IPublishedValueFallback publishedValueFallback)\n\t\t\t: base(content)\n\t\t{{\n\t\t\t_publishedValueFallback = publishedValueFallback;\n\t\t}}\n\n",
                 type.ClrName, type.IsElement ? "Element" : "Content");
 
             // write the properties
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs
index 7f6eb290b7..c4840ec6af 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs
@@ -278,14 +278,14 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreThings
             // unless we want to know
             Assert.IsFalse(UdiParser.TryParse("umb://whatever/1234", true, out udi));
             Assert.AreEqual(Constants.UdiEntityType.Unknown, udi.EntityType);
-            Assert.AreEqual("Umbraco.Core.UnknownTypeUdi", udi.GetType().FullName);
+            Assert.AreEqual("Umbraco.Cms.Core.UnknownTypeUdi", udi.GetType().FullName);
 
             UdiParser.ResetUdiTypes();
 
             // not known
             Assert.IsFalse(UdiParser.TryParse("umb://foo/A87F65C8D6B94E868F6949BA92C93045", true, out udi));
             Assert.AreEqual(Constants.UdiEntityType.Unknown, udi.EntityType);
-            Assert.AreEqual("Umbraco.Core.UnknownTypeUdi", udi.GetType().FullName);
+            Assert.AreEqual("Umbraco.Cms.Core.UnknownTypeUdi", udi.GetType().FullName);
 
             // scanned
             UdiParserServiceConnectors.RegisterServiceConnector<FooConnector>(); // this is the equivalent of scanning but we'll just manually register this one
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
index 7b19d1e9f9..5f71d4d46a 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.Core.Models.PublishedContent;
 using Umbraco.Web.PublishedCache;
 using Umbraco.ModelsBuilder.Embedded;
-using Umbraco.Core;
+using Umbraco.Cms.Core;
 
 namespace Umbraco.Web.PublishedModels
 {
@@ -167,7 +167,7 @@ using System.Linq.Expressions;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.PublishedCache;
 using Umbraco.ModelsBuilder.Embedded;
-using Umbraco.Core;
+using Umbraco.Cms.Core;
 
 namespace Umbraco.Web.PublishedModels
 {
@@ -258,9 +258,9 @@ namespace Umbraco.Web.PublishedModels
 
             Console.WriteLine(gen);
 
-            Assert.IsTrue(gen.Contains(" global::Umbraco.Core.Models.PublishedContent.IPublishedContent Prop1"));
+            Assert.IsTrue(gen.Contains(" global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent Prop1"));
             Assert.IsTrue(gen.Contains(" global::System.Text.StringBuilder Prop2"));
-            Assert.IsTrue(gen.Contains(" global::Umbraco.Core.Exceptions.BootFailedException Prop3"));
+            Assert.IsTrue(gen.Contains(" global::Umbraco.Cms.Core.Exceptions.BootFailedException Prop3"));
         }
 
         [TestCase("int", typeof(int))]