diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs index 03b3b7425d..60356f4c6c 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs @@ -15,49 +15,19 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose { public void Compose(Composition composition) { - var isLegacyModelsBuilderInstalled = IsLegacyModelsBuilderInstalled(); - - if (isLegacyModelsBuilderInstalled) - { - ComposeForLegacyModelsBuilder(composition); - return; - } - composition.Components().Append(); composition.Register(Lifetime.Singleton); composition.RegisterUnique(); composition.RegisterUnique(); composition.RegisterUnique(); composition.RegisterUnique(); - + if (composition.Configs.ModelsBuilder().ModelsMode == ModelsMode.PureLive) ComposeForLiveModels(composition); else if (composition.Configs.ModelsBuilder().EnableFactory) ComposeForDefaultModelsFactory(composition); } - private static bool IsLegacyModelsBuilderInstalled() - { - Assembly legacyMbAssembly = null; - try - { - legacyMbAssembly = Assembly.Load("Umbraco.ModelsBuilder"); - } - catch (System.Exception) - { - //swallow exception, DLL must not be there - } - - return legacyMbAssembly != null; - } - - private void ComposeForLegacyModelsBuilder(Composition composition) - { - composition.Logger.Info("ModelsBuilder.Embedded is disabled, the external ModelsBuilder was detected."); - composition.Components().Append(); - composition.Dashboards().Remove(); - } - private void ComposeForDefaultModelsFactory(Composition composition) { composition.RegisterUnique(factory =>