Renames project: Umbraco.ModelsBuilder.Embedded and namespaces since we need a different assembly, updates nuspec, changes file path of MB app_plugins

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -52,17 +52,17 @@
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.dll" target="lib\net472\Umbraco.ModelsBuilder.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.dll" target="lib\net472\Umbraco.ModelsBuilder.Embedded.dll" />
 
         <!-- docs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\net472\Umbraco.Web.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net472\Umbraco.Web.UI.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\net472\Umbraco.Examine.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.xml" target="lib\net472\Umbraco.ModelsBuilder.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.xml" target="lib\net472\Umbraco.ModelsBuilder.Embedded.xml" />
 
         <!-- symbols -->
         <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib\net472\Umbraco.Web.pdb" />
         <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib\net472\Umbraco.Examine.pdb" />
-        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.pdb" target="lib\net472\Umbraco.ModelsBuilder.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.pdb" target="lib\net472\Umbraco.ModelsBuilder.Embedded.pdb" />
     </files>
 </package>

build/NuSpecs/UmbracoCms.nuspec

@@ -42,6 +42,7 @@
         <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
         <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
         <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+        <file src="$BuildTmp$\WebApp\App_Plugins\UmbModelsBuilder\**" target="Content\App_Plugins\UmbModelsBuilder" />
 
         <!-- these files are copied by install.ps1 -->
         <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />

src/Umbraco.Core/Properties/AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("Umbraco.Web")]
 [assembly: InternalsVisibleTo("Umbraco.Web.UI")]
 [assembly: InternalsVisibleTo("Umbraco.Examine")]
-[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")]
+[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.Embedded")]
 
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
 [assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")]

src/Umbraco.ModelsBuilder.Embedded/ApiVersion.cs

@@ -2,7 +2,7 @@
 using System.Reflection;
 using Semver;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Manages API version handshake between client and server.

src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs

@@ -2,13 +2,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.ModelsBuilder.Configuration;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.ModelsBuilder.BackOffice
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
     /// <summary>
     /// Used to validate the aliases for the content type when MB is enabled to ensure that

src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs

@@ -1,8 +1,7 @@
 using System.Text;
-using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.BackOffice
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
     internal class DashboardReport
     {

src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderBackOfficeController.cs

@@ -1,18 +1,15 @@
 using System;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Web.Hosting;
 using Umbraco.Core.Exceptions;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Editors;
 using Umbraco.Web.WebApi.Filters;
 
-namespace Umbraco.ModelsBuilder.BackOffice
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
     /// <summary>
     /// API controller for use in the Umbraco back office with Angular resources

src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs

@@ -1,15 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     // NOTE
     // The idea was to have different types of builder, because I wanted to experiment with

src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs

@@ -1,10 +1,8 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Text;
-using System.Web;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     public class ModelsGenerator
     {

src/Umbraco.ModelsBuilder.Embedded/Building/PropertyModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     /// <summary>
     /// Represents a model property.

src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs

@@ -3,11 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     /// <summary>
     /// Implements a builder that works by writing text.

src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     internal static class TextHeaderWriter
     {

src/Umbraco.ModelsBuilder.Embedded/Building/TypeModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models.PublishedContent;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     /// <summary>
     /// Represents a model.

src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     internal class TypeModelHasher
     {

src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs

@@ -8,13 +8,13 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
-using Umbraco.ModelsBuilder.BackOffice;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.BackOffice;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 
-namespace Umbraco.ModelsBuilder.Compose
+namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
     public class ModelsBuilderComponent : IComponent
     {

src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs

@@ -2,11 +2,11 @@
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.PublishedCache.NuCache;
 
-namespace Umbraco.ModelsBuilder.Compose
+namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
     [ComposeBefore(typeof(NuCacheComposer))]
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
@@ -16,6 +16,8 @@ namespace Umbraco.ModelsBuilder.Compose
         {
             base.Compose(composition);
 
+          
+
             composition.Register<UmbracoServices>(Lifetime.Singleton);
             composition.Configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig());
             composition.RegisterUnique<ModelsGenerator>();

src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderInitializer.cs

@@ -1,10 +1,10 @@
 using System.Web;
 using System.Web.Compilation;
-using Umbraco.ModelsBuilder.Compose;
+using Umbraco.ModelsBuilder.Embedded.Compose;
 
 [assembly: PreApplicationStartMethod(typeof(ModelsBuilderInitializer), "Initialize")]
 
-namespace Umbraco.ModelsBuilder.Compose
+namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
     public static class ModelsBuilderInitializer
     {

src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs

@@ -1,7 +1,7 @@
 using Umbraco.Core.Configuration;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Provides extension methods for the <see cref="UmbracoConfig"/> class.

src/Umbraco.ModelsBuilder.Embedded/Configuration/IModelsBuilderConfig.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     public interface IModelsBuilderConfig
     {

src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs

@@ -2,11 +2,10 @@
 using System.Configuration;
 using System.IO;
 using System.Web.Configuration;
-using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     /// <summary>
     /// Represents the models builder configuration.

src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsMode.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     /// <summary>
     /// Defines the models generation modes.

src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsModeExtensions.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     /// <summary>
     /// Provides extensions for the <see cref="ModelsMode"/> enumeration.

src/Umbraco.ModelsBuilder.Embedded/HashCombiner.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     // because, of course, it's internal in Umbraco
     // see also System.Web.Util.HashCodeCombiner

src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Indicates that a property implements a given property alias.

src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs

@@ -1,15 +1,12 @@
 using System;
 using System.Threading;
-using System.Web;
 using System.Web.Hosting;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Cache;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     // supports LiveAppData - but not PureLive
     public sealed class LiveModelsProvider

src/Umbraco.ModelsBuilder.Embedded/LiveModelsProviderModule.cs

@@ -2,12 +2,12 @@
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder;
+using Umbraco.ModelsBuilder.Embedded;
 
 // will install only if configuration says it needs to be installed
 [assembly: PreApplicationStartMethod(typeof(LiveModelsProviderModule), "Install")]
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     // have to do this because it's the only way to subscribe to EndRequest,
     // module is installed by assembly attribute at the top of this file

src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderAssemblyAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Indicates that an Assembly is a Models Builder assembly.

src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs

@@ -1,10 +1,9 @@
 using System;
 using System.IO;
 using System.Text;
-using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class ModelsGenerationError
     {

src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs

@@ -1,9 +1,8 @@
 using System.IO;
-using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Cache;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class OutOfDateModelsStatus
     {

src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs

@@ -3,6 +3,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder;
+using Umbraco.ModelsBuilder.Embedded;
 
 // same namespace as original Umbraco.Web PublishedElementExtensions
 // ReSharper disable once CheckNamespace

src/Umbraco.ModelsBuilder.Embedded/PublishedModelUtility.cs

@@ -1,11 +1,10 @@
 using System;
-using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// This is called from within the generated model classes

src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs

@@ -13,15 +13,13 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 using System.Web.WebPages.Razor;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web.Cache;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using File = System.IO.File;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     internal class PureLiveModelFactory : ILivePublishedModelFactory, IRegisteredObject
     {

src/Umbraco.ModelsBuilder.Embedded/ReferencedAssemblies.cs

@@ -6,7 +6,7 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 using Umbraco.Core;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     internal static class ReferencedAssemblies
     {

src/Umbraco.ModelsBuilder.Embedded/TypeExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     internal static class TypeExtensions
     {

src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{52AC0BA8-A60E-4E36-897B-E8B97A54ED1C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Umbraco.ModelsBuilder</RootNamespace>
-    <AssemblyName>Umbraco.ModelsBuilder</AssemblyName>
+    <RootNamespace>Umbraco.ModelsBuilder.Embedded</RootNamespace>
+    <AssemblyName>Umbraco.ModelsBuilder.Embedded</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -30,7 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Umbraco.ModelsBuilder.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\Umbraco.ModelsBuilder.Embedded.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs

@@ -2,16 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class UmbracoServices
     {

src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs

@@ -2,15 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.CodeAnalysis;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     [TestFixture]
     public class BuilderTests
@@ -246,7 +245,7 @@ namespace Umbraco.Web.PublishedModels
             {
                 Alias = "prop2",
                 ClrName = "Prop2",
-                ModelClrType = typeof(System.Text.StringBuilder),
+                ModelClrType = typeof(global::System.Text.StringBuilder),
             });
             type1.Properties.Add(new PropertyModel
             {
@@ -342,7 +341,7 @@ namespace Umbraco.Web.PublishedModels
             builder.Using.Add("Umbraco.ModelsBuilder.Tests");
             builder.ModelsNamespaceForTests = "SomeRandomNamespace";
             var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(System.Text.ASCIIEncoding));
+            builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
 
             // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
             // which means global:: syntax will be applied to most things
@@ -358,7 +357,7 @@ namespace Umbraco.Web.PublishedModels
             builder.Using.Add("Umbraco.ModelsBuilder.Tests");
             builder.ModelsNamespaceForTests = "SomeBorkedNamespace";
             var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(System.Text.ASCIIEncoding));
+            builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
 
             // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
             // which means global:: syntax will be applied to most things
@@ -417,7 +416,7 @@ namespace Umbraco.Web.PublishedModels
         public class Class1 { }
     }
 
-    // make it public to be ambiguous (see above)
+// make it public to be ambiguous (see above)
     public class ASCIIEncoding
     {
         // can we handle nested types?
@@ -425,9 +424,6 @@ namespace Umbraco.Web.PublishedModels
     }
 
     class BuilderTestsClass1 {}
-}
 
-namespace SomeBorkedNamespace
-{
     public class System { }
 }

src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs

@@ -1,8 +1,8 @@
 using System.Configuration;
 using NUnit.Framework;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     [TestFixture]
     public class ModelsBuilderConfigTests

src/Umbraco.Tests/ModelsBuilder/StringExtensions.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     public static class StringExtensions
     {

src/Umbraco.Tests/ModelsBuilder/UmbracoApplicationTests.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
-using Umbraco.ModelsBuilder.Building;
+using Umbraco.ModelsBuilder.Embedded;
+using Umbraco.ModelsBuilder.Embedded.Building;
 
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     [TestFixture]
     public class UmbracoApplicationTests

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -553,9 +553,9 @@
       <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
       <Name>Umbraco.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.ModelsBuilder\Umbraco.ModelsBuilder.csproj">
+    <ProjectReference Include="..\Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj">
       <Project>{52ac0ba8-a60e-4e36-897b-e8b97a54ed1c}</Project>
-      <Name>Umbraco.ModelsBuilder</Name>
+      <Name>Umbraco.ModelsBuilder.Embedded</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -12,7 +12,7 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort>44319</IISExpressSSLPort>
+    <IISExpressSSLPort>44331</IISExpressSSLPort>
     <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
     <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
     <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
@@ -118,10 +118,6 @@
       <Name>Umbraco.Examine</Name>
       <Project>{07FBC26B-2927-4A22-8D96-D644C667FECC}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.ModelsBuilder\Umbraco.ModelsBuilder.csproj">
-      <Project>{52ac0ba8-a60e-4e36-897b-e8b97a54ed1c}</Project>
-      <Name>Umbraco.ModelsBuilder</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
       <Name>Umbraco.Web</Name>
@@ -144,9 +140,9 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.html" />
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
+    <Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.controller.js" />
+    <Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.html" />
+    <Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.resource.js" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />
     <Content Include="Config\Lang\da-DK.user.xml" />
@@ -172,7 +168,7 @@
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
     <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
-    <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
+    <Content Include="App_Plugins\UmbModelsBuilder\package.manifest" />
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
       <SubType>Designer</SubType>

src/umbraco.sln

@@ -1,6 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
 VisualStudioVersion = 16.0.29209.152
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
@@ -103,7 +102,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IssueTemplates", "IssueTemp
 		..\.github\ISSUE_TEMPLATE\5_Security_issue.md = ..\.github\ISSUE_TEMPLATE\5_Security_issue.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.ModelsBuilder", "Umbraco.ModelsBuilder\Umbraco.ModelsBuilder.csproj", "{52AC0BA8-A60E-4E36-897B-E8B97A54ED1C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.ModelsBuilder.Embedded", "Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj", "{52AC0BA8-A60E-4E36-897B-E8B97A54ED1C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution