From acc7065fa1186ff6cde04d3552ff9f0511bd495f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 23 Sep 2020 14:22:53 +0200
Subject: [PATCH] Fixed issue with models builder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
---
 .../Compose/ModelsBuilderComposer.cs                         | 5 ++---
 .../DummyClassSoThatPublishedModelsNamespaceExists.cs        | 0
 src/Umbraco.Web.UI.NetCore/appsettings.json                  | 4 ++--
 src/Umbraco.Web/Umbraco.Web.csproj                           | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Web.Common}/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs (100%)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index 3e63fb8e94..bc61f2eaee 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -24,14 +24,13 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
             composition.RegisterUnique<OutOfDateModelsStatus>();
             composition.RegisterUnique<ModelsGenerationError>();
 
-
+            composition.RegisterUnique<PureLiveModelFactory>();
             composition.RegisterUnique<IPublishedModelFactory>(factory =>
             {
                 var config = factory.GetInstance<IOptions<ModelsBuilderSettings>>().Value;
                 if (config.ModelsMode == ModelsMode.PureLive)
                 {
-                    composition.RegisterUnique<IPublishedModelFactory, PureLiveModelFactory>();
-
+                    return factory.GetInstance<PureLiveModelFactory>();
                     // the following would add @using statement in every view so user's don't
                     // have to do it - however, then noone understands where the @using statement
                     // comes from, and it cannot be avoided / removed --- DISABLED
diff --git a/src/Umbraco.Web/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs b/src/Umbraco.Web.Common/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs
similarity index 100%
rename from src/Umbraco.Web/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs
rename to src/Umbraco.Web.Common/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 3d9560dd9a..70e3d6376d 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -66,8 +66,8 @@
         "EnableTours": true
       },
       "ModelsBuilder": {
-        "ModelsMode": "Nothing",
-        "Enable": "true"
+        "ModelsMode": "PureLive",
+        "Enable": false
       }
     }
   }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 51090aca7e..7a0f584baa 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -230,7 +230,6 @@
     <Compile Include="Mvc\FilteredControllerFactoryCollectionBuilder.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollection.cs" />
     <Compile Include="PublishedElementExtensions.cs" />
-    <Compile Include="PublishedModels\DummyClassSoThatPublishedModelsNamespaceExists.cs" />
     <Compile Include="Security\AuthenticationExtensions.cs" />
     <Compile Include="Security\UmbracoSecureDataFormat.cs" />
     <Compile Include="Security\UmbracoAuthTicketDataProtector.cs" />