Reverted non netcore related project amends in order to limit changes to those necessary for the netcore executable call stack.

This commit is contained in:
Andy Butland
2020-08-23 13:55:36 +02:00
parent 52a65caf88
commit 89b725ef28
80 changed files with 1073 additions and 365 deletions

View File

@@ -6,7 +6,6 @@ using Umbraco.Core.Hosting;
using Umbraco.Core.Logging;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Web.Cache;
using Umbraco.Core.Configuration.Models;
namespace Umbraco.ModelsBuilder.Embedded
{
@@ -16,7 +15,7 @@ namespace Umbraco.ModelsBuilder.Embedded
private static Mutex _mutex;
private static int _req;
private readonly ILogger _logger;
private readonly ModelsBuilderConfig _config;
private readonly IModelsBuilderConfig _config;
private readonly ModelsGenerator _modelGenerator;
private readonly ModelsGenerationError _mbErrors;
private readonly IHostingEnvironment _hostingEnvironment;
@@ -24,7 +23,7 @@ namespace Umbraco.ModelsBuilder.Embedded
// we do not manage pure live here
internal bool IsEnabled => _config.ModelsMode.IsLiveNotPure();
public LiveModelsProvider(ILogger logger, ModelsBuilderConfig config, ModelsGenerator modelGenerator, ModelsGenerationError mbErrors, IHostingEnvironment hostingEnvironment)
public LiveModelsProvider(ILogger logger, IModelsBuilderConfig config, ModelsGenerator modelGenerator, ModelsGenerationError mbErrors, IHostingEnvironment hostingEnvironment)
{
_logger = logger;
_config = config ?? throw new ArgumentNullException(nameof(config));