build fixes

This commit is contained in:
Bjarke Berg
2020-03-17 20:13:16 +01:00
parent c2805a5067
commit fb15da61aa
5 changed files with 7 additions and 34 deletions

View File

@@ -29,7 +29,7 @@ namespace Umbraco.Configuration
configs.Add<IMemberPasswordConfiguration>(() => new MemberPasswordConfigurationSettings(_configuration)); configs.Add<IMemberPasswordConfiguration>(() => new MemberPasswordConfigurationSettings(_configuration));
configs.Add<IKeepAliveSettings>(() => new KeepAliveSettings(_configuration)); configs.Add<IKeepAliveSettings>(() => new KeepAliveSettings(_configuration));
configs.Add<IContentSettings>(() => new ContentSettings(_configuration)); configs.Add<IContentSettings>(() => new ContentSettings(_configuration));
configs.Add<IHealthChecksSettings>(() => new HealthChecksSettingsSettings(_configuration)); configs.Add<IHealthChecksSettings>(() => new HealthChecksSettings(_configuration));
configs.Add<ILoggingSettings>(() => new LoggingSettings(_configuration)); configs.Add<ILoggingSettings>(() => new LoggingSettings(_configuration));
configs.Add<IExceptionFilterSettings>(() => new ExceptionFilterSettings(_configuration)); configs.Add<IExceptionFilterSettings>(() => new ExceptionFilterSettings(_configuration));
configs.Add<IActiveDirectorySettings>(() => new ActiveDirectorySettings(_configuration)); configs.Add<IActiveDirectorySettings>(() => new ActiveDirectorySettings(_configuration));

View File

@@ -2,7 +2,6 @@ using Umbraco.Configuration;
using Umbraco.Configuration.Implementations; using Umbraco.Configuration.Implementations;
using Umbraco.Configuration.Legacy; using Umbraco.Configuration.Legacy;
using Umbraco.Core.Configuration.HealthChecks; using Umbraco.Core.Configuration.HealthChecks;
using Umbraco.Core.Configuration.Implementations;
using Umbraco.Core.Configuration.Legacy; using Umbraco.Core.Configuration.Legacy;
using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Configuration.UmbracoSettings;
@@ -29,7 +28,7 @@ namespace Umbraco.Core.Configuration
public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings(); public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
public IContentSettings ContentSettings { get; } = new ContentSettings(); public IContentSettings ContentSettings { get; } = new ContentSettings();
public IGlobalSettings GlobalSettings { get; } = new GlobalSettings(); public IGlobalSettings GlobalSettings { get; } = new GlobalSettings();
public IHealthChecksSettings HealthChecksSettingsSettings { get; } = new HealthChecksSettingsSettings(); public IHealthChecksSettings HealthChecksSettings { get; } = new HealthChecksSettings();
public IConnectionStrings ConnectionStrings { get; } = new ConnectionStrings(); public IConnectionStrings ConnectionStrings { get; } = new ConnectionStrings();
public IModelsBuilderConfig ModelsBuilderConfig { get; } = new ModelsBuilderConfig(); public IModelsBuilderConfig ModelsBuilderConfig { get; } = new ModelsBuilderConfig();
@@ -39,7 +38,7 @@ namespace Umbraco.Core.Configuration
configs.Add<IGlobalSettings>(() => GlobalSettings); configs.Add<IGlobalSettings>(() => GlobalSettings);
configs.Add<IHostingSettings>(() => HostingSettings); configs.Add<IHostingSettings>(() => HostingSettings);
configs.Add<IHealthChecksSettings>(() => HealthChecksSettingsSettings); configs.Add<IHealthChecksSettings>(() => HealthChecksSettings);
configs.Add<ICoreDebugSettings>(() => CoreDebugSettings); configs.Add<ICoreDebugSettings>(() => CoreDebugSettings);
configs.Add<IMachineKeyConfig>(() => MachineKeyConfig); configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
configs.Add<IConnectionStrings>(() => ConnectionStrings); configs.Add<IConnectionStrings>(() => ConnectionStrings);

View File

@@ -2,9 +2,9 @@
using System.Configuration; using System.Configuration;
using Umbraco.Core.Configuration.HealthChecks; using Umbraco.Core.Configuration.HealthChecks;
namespace Umbraco.Core.Configuration.Implementations namespace Umbraco.Core.Configuration.Legacy
{ {
public class HealthChecksSettings : IHealthChecks public class HealthChecksSettings : IHealthChecksSettings
{ {
private HealthChecksSection _healthChecksSection; private HealthChecksSection _healthChecksSection;

View File

@@ -1,26 +0,0 @@
using System.Collections.Generic;
using System.Configuration;
using Umbraco.Core.Configuration.HealthChecks;
namespace Umbraco.Core.Configuration.Implementations
{
public class HealthChecksSettingsSettings : IHealthChecksSettings
{
private HealthChecksSection _healthChecksSection;
private HealthChecksSection HealthChecksSection
{
get
{
if (_healthChecksSection is null)
{
_healthChecksSection = ConfigurationManager.GetSection("umbracoConfiguration/HealthChecks") as HealthChecksSection;
}
return _healthChecksSection;
}
}
public IEnumerable<IDisabledHealthCheck> DisabledChecks => HealthChecksSection.DisabledChecks;
public IHealthCheckNotificationSettings NotificationSettings => HealthChecksSection.NotificationSettings;
}
}

View File

@@ -6,10 +6,10 @@ using Umbraco.Core.Configuration.HealthChecks;
namespace Umbraco.Configuration.Models namespace Umbraco.Configuration.Models
{ {
internal class HealthChecksSettingsSettings : IHealthChecksSettings internal class HealthChecksSettings : IHealthChecksSettings
{ {
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
public HealthChecksSettingsSettings(IConfiguration configuration) public HealthChecksSettings(IConfiguration configuration)
{ {
_configuration = configuration; _configuration = configuration;
} }