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

Post merge fix (conflicts)

Browse Source
This commit is contained in:
Bjarke Berg
2021-01-25 07:37:05 +01:00
parent b885bcf193
commit 647d6ac5ab
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.ModelsBuilder.Embedded/DisableModelsBuilderNotificationHandler.cs
View File

@@ -1,5 +1,3 @@
using System.Threading;
using System.Threading.Tasks;
using Umbraco.Core.Events;
using Umbraco.ModelsBuilder.Embedded.BackOffice;
using Umbraco.ModelsBuilder.Embedded.DependencyInjection;
@@ -19,11 +17,10 @@ namespace Umbraco.ModelsBuilder.Embedded
/// <summary>
/// Handles the <see cref="UmbracoApplicationStarting"/> notification to disable MB controller features
/// </summary>
public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
public void Handle(UmbracoApplicationStarting notification)
{
// disable the embedded dashboard controller
_features.Disabled.Controllers.Add<ModelsBuilderDashboardController>();
return Task.CompletedTask;
}
}
}

5
src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
@@ -8,7 +7,6 @@ using Umbraco.Configuration;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Events;
using Umbraco.Core.Hosting;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Web.Cache;
@@ -52,10 +50,9 @@ namespace Umbraco.ModelsBuilder.Embedded
/// <summary>
/// Handles the <see cref="UmbracoApplicationStarting"/> notification
/// </summary>
public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
public void Handle(UmbracoApplicationStarting notification)
{
Install();
return Task.CompletedTask;
}
private void Install()

10
src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
View File

@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Options;
using Umbraco.Core.Configuration;
@@ -47,7 +45,7 @@ namespace Umbraco.ModelsBuilder.Embedded
/// <summary>
/// Handles the <see cref="UmbracoApplicationStarting"/> notification
/// </summary>
public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
public void Handle(UmbracoApplicationStarting notification)
{
// always setup the dashboard
// note: UmbracoApiController instances are automatically registered
@@ -57,14 +55,12 @@ namespace Umbraco.ModelsBuilder.Embedded
{
FileService.SavingTemplate += FileService_SavingTemplate;
}
return Task.CompletedTask;
}
/// <summary>
/// Handles the <see cref="ServerVariablesParsing"/> notification
/// </summary>
public Task HandleAsync(ServerVariablesParsing notification, CancellationToken cancellationToken)
public void Handle(ServerVariablesParsing notification)
{
IDictionary<string, object> serverVars = notification.ServerVariables;
@@ -96,8 +92,6 @@ namespace Umbraco.ModelsBuilder.Embedded
umbracoUrls["modelsBuilderBaseUrl"] = _linkGenerator.GetUmbracoApiServiceBaseUrl<ModelsBuilderDashboardController>(controller => controller.BuildModels());
umbracoPlugins["modelsBuilder"] = GetModelsBuilderSettings();
return Task.CompletedTask;
}
private Dictionary<string, object> GetModelsBuilderSettings()

5
src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
View File

@@ -1,6 +1,4 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
@@ -40,10 +38,9 @@ namespace Umbraco.ModelsBuilder.Embedded
/// <summary>
/// Handles the <see cref="UmbracoApplicationStarting"/> notification
/// </summary>
public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
public void Handle(UmbracoApplicationStarting notification)
{
Install();
return Task.CompletedTask;
}
private void Install()