yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the init of legacy MB. Future versions of the full MB will have to disable the embedded MB

Browse Source 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Bjarke Berg
2020-09-09 11:15:14 +02:00
parent 6cd8617202
commit 8a68ba9547
1 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
View File

@@ -15,49 +15,19 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
{ {
public void Compose(Composition composition) public void Compose(Composition composition)
{ {
var isLegacyModelsBuilderInstalled = IsLegacyModelsBuilderInstalled();
if (isLegacyModelsBuilderInstalled)
{
ComposeForLegacyModelsBuilder(composition);
return;
}
composition.Components().Append<ModelsBuilderComponent>(); composition.Components().Append<ModelsBuilderComponent>();
composition.Register<UmbracoServices>(Lifetime.Singleton); composition.Register<UmbracoServices>(Lifetime.Singleton);
composition.RegisterUnique<ModelsGenerator>(); composition.RegisterUnique<ModelsGenerator>();
composition.RegisterUnique<LiveModelsProvider>(); composition.RegisterUnique<LiveModelsProvider>();
composition.RegisterUnique<OutOfDateModelsStatus>(); composition.RegisterUnique<OutOfDateModelsStatus>();
composition.RegisterUnique<ModelsGenerationError>(); composition.RegisterUnique<ModelsGenerationError>();
if (composition.Configs.ModelsBuilder().ModelsMode == ModelsMode.PureLive) if (composition.Configs.ModelsBuilder().ModelsMode == ModelsMode.PureLive)
ComposeForLiveModels(composition); ComposeForLiveModels(composition);
else if (composition.Configs.ModelsBuilder().EnableFactory) else if (composition.Configs.ModelsBuilder().EnableFactory)
ComposeForDefaultModelsFactory(composition); 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<ModelsBuilderComposer>("ModelsBuilder.Embedded is disabled, the external ModelsBuilder was detected.");
composition.Components().Append<DisabledModelsBuilderComponent>();
composition.Dashboards().Remove<ModelsBuilderDashboard>();
}
private void ComposeForDefaultModelsFactory(Composition composition) private void ComposeForDefaultModelsFactory(Composition composition)
{ {
composition.RegisterUnique<IPublishedModelFactory>(factory => composition.RegisterUnique<IPublishedModelFactory>(factory =>