diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs deleted file mode 100644 index 15378a5860..0000000000 --- a/src/Umbraco.Configuration/ConfigsFactory.cs +++ /dev/null @@ -1,63 +0,0 @@ -// using Umbraco.Configuration; -// using Umbraco.Configuration.Implementations; -// using Umbraco.Configuration.Legacy; -// using Umbraco.Core.Configuration.HealthChecks; -// using Umbraco.Core.Configuration.Legacy; -// using Umbraco.Core.Configuration.UmbracoSettings; -// -// namespace Umbraco.Core.Configuration -// { -// public class ConfigsFactory : IConfigsFactory -// { -// public IHostingSettings HostingSettings { get; } = new HostingSettings(); -// public ICoreDebugSettings CoreDebugSettings { get; } = new CoreDebugSettings(); -// public IIndexCreatorSettings IndexCreatorSettings { get; } = new IndexCreatorSettings(); -// public INuCacheSettings NuCacheSettings { get; } = new NuCacheSettings(); -// public ITypeFinderSettings TypeFinderSettings { get; } = new TypeFinderSettings(); -// public IRuntimeSettings RuntimeSettings { get; } = new RuntimeSettings(); -// public IActiveDirectorySettings ActiveDirectorySettings { get; } = new ActiveDirectorySettings(); -// public IExceptionFilterSettings ExceptionFilterSettings { get; } = new ExceptionFilterSettings(); -// public ITourSettings TourSettings { get; } = new TourSettings(); -// public ILoggingSettings LoggingSettings { get; } = new LoggingSettings(); -// public IKeepAliveSettings KeepAliveSettings { get; } = new KeepAliveSettings(); -// public IWebRoutingSettings WebRoutingSettings { get; } = new WebRoutingSettings(); -// public IRequestHandlerSettings RequestHandlerSettings { get; } = new RequestHandlerSettings(); -// public ISecuritySettings SecuritySettings { get; } = new SecuritySettings(); -// public IUserPasswordConfiguration UserPasswordConfigurationSettings { get; } = new UserPasswordConfigurationSettings(); -// public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings(); -// public IContentSettings ContentSettings { get; } = new ContentSettings(); -// public IGlobalSettings GlobalSettings { get; } = new GlobalSettings(); -// public IHealthChecksSettings HealthChecksSettings { get; } = new HealthChecksSettings(); -// public IConnectionStrings ConnectionStrings { get; } = new ConnectionStrings(); -// public IModelsBuilderConfig ModelsBuilderConfig { get; } = new ModelsBuilderConfig(); -// -// public Configs Create() -// { -// var configs = new Configs(); -// -// configs.Add(() => GlobalSettings); -// configs.Add(() => HostingSettings); -// configs.Add(() => HealthChecksSettings); -// configs.Add(() => CoreDebugSettings); -// configs.Add(() => ConnectionStrings); -// configs.Add(() => ModelsBuilderConfig); -// configs.Add(() => IndexCreatorSettings); -// configs.Add(() => NuCacheSettings); -// configs.Add(() => TypeFinderSettings); -// configs.Add(() => RuntimeSettings); -// configs.Add(() => ActiveDirectorySettings); -// configs.Add(() => ExceptionFilterSettings); -// configs.Add(() => TourSettings); -// configs.Add(() => LoggingSettings); -// configs.Add(() => KeepAliveSettings); -// configs.Add(() => WebRoutingSettings); -// configs.Add(() => RequestHandlerSettings); -// configs.Add(() => SecuritySettings); -// configs.Add(() => UserPasswordConfigurationSettings); -// configs.Add(() => MemberPasswordConfigurationSettings); -// configs.Add(() => ContentSettings); -// -// return configs; -// } -// } -// } diff --git a/src/Umbraco.Configuration/Legacy/IndexCreatorSettings.cs b/src/Umbraco.Configuration/Legacy/IndexCreatorSettings.cs deleted file mode 100644 index d023d46246..0000000000 --- a/src/Umbraco.Configuration/Legacy/IndexCreatorSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Configuration; -using Umbraco.Core.Configuration; - -namespace Umbraco.Configuration.Legacy -{ - public class IndexCreatorSettings : IIndexCreatorSettings - { - public IndexCreatorSettings() - { - LuceneDirectoryFactory = ConfigurationManager.AppSettings["Umbraco.Examine.LuceneDirectoryFactory"]; - } - - public string LuceneDirectoryFactory { get; } - } -} diff --git a/src/Umbraco.Configuration/Legacy/KeepAliveSettings.cs b/src/Umbraco.Configuration/Legacy/KeepAliveSettings.cs deleted file mode 100644 index 0b8315d447..0000000000 --- a/src/Umbraco.Configuration/Legacy/KeepAliveSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Configuration.Implementations -{ - internal class KeepAliveSettings : ConfigurationManagerConfigBase, IKeepAliveSettings - { - public bool DisableKeepAliveTask => UmbracoSettingsSection.KeepAlive.DisableKeepAliveTask; - public string KeepAlivePingUrl => UmbracoSettingsSection.KeepAlive.KeepAlivePingUrl; - } -} diff --git a/src/Umbraco.Configuration/Legacy/NuCacheSettings.cs b/src/Umbraco.Configuration/Legacy/NuCacheSettings.cs deleted file mode 100644 index 25f52a5c7d..0000000000 --- a/src/Umbraco.Configuration/Legacy/NuCacheSettings.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Configuration; -using Umbraco.Core.Configuration; - -namespace Umbraco.Configuration.Legacy -{ - public class NuCacheSettings : INuCacheSettings - { - public NuCacheSettings() - { - BTreeBlockSize = ConfigurationManager.AppSettings["Umbraco.Web.PublishedCache.NuCache.BTree.BlockSize"]; - } - public string BTreeBlockSize { get; } - } -} diff --git a/src/Umbraco.Configuration/Legacy/TourSettings.cs b/src/Umbraco.Configuration/Legacy/TourSettings.cs deleted file mode 100644 index 134c3c48d5..0000000000 --- a/src/Umbraco.Configuration/Legacy/TourSettings.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Configuration.Implementations -{ - internal class TourSettings : ConfigurationManagerConfigBase, ITourSettings - { - public bool EnableTours => UmbracoSettingsSection.BackOffice.Tours.EnableTours; - } -} diff --git a/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs b/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs deleted file mode 100644 index b4bb000552..0000000000 --- a/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Umbraco.Core; -using Umbraco.Core.Configuration; - -namespace Umbraco.Configuration.Models -{ - internal class IndexCreatorSettings : IIndexCreatorSettings - { - private const string Prefix = Constants.Configuration.ConfigPrefix + "Examine:"; - private readonly IConfiguration _configuration; - - public IndexCreatorSettings(IConfiguration configuration) - { - _configuration = configuration; - } - - public string LuceneDirectoryFactory => - _configuration.GetValue(Prefix + "LuceneDirectoryFactory"); - } -} diff --git a/src/Umbraco.Configuration/Models/KeepAliveSettings.cs b/src/Umbraco.Configuration/Models/KeepAliveSettings.cs deleted file mode 100644 index 04194e1a3c..0000000000 --- a/src/Umbraco.Configuration/Models/KeepAliveSettings.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Umbraco.Core; -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Configuration.Models -{ - internal class KeepAliveSettings : IKeepAliveSettings - { - private const string Prefix = Constants.Configuration.ConfigPrefix + "KeepAlive:"; - private readonly IConfiguration _configuration; - - public KeepAliveSettings(IConfiguration configuration) - { - _configuration = configuration; - } - - public bool DisableKeepAliveTask => - _configuration.GetValue(Prefix + "DisableKeepAliveTask", false); - - public string KeepAlivePingUrl => _configuration.GetValue(Prefix + "KeepAlivePingUrl", - "{umbracoApplicationUrl}/api/keepalive/ping"); - } -} diff --git a/src/Umbraco.Configuration/Models/NuCacheSettings.cs b/src/Umbraco.Configuration/Models/NuCacheSettings.cs deleted file mode 100644 index 51b8b1fe08..0000000000 --- a/src/Umbraco.Configuration/Models/NuCacheSettings.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Umbraco.Core; -using Umbraco.Core.Configuration; - -namespace Umbraco.Configuration.Models -{ - internal class NuCacheSettings : INuCacheSettings - { - private const string Prefix = Constants.Configuration.ConfigPrefix + "NuCache:"; - private readonly IConfiguration _configuration; - - public NuCacheSettings(IConfiguration configuration) - { - _configuration = configuration; - } - - public string BTreeBlockSize => _configuration.GetValue(Prefix+"BTreeBlockSize"); - } -} diff --git a/src/Umbraco.Configuration/Models/TourSettings.cs b/src/Umbraco.Configuration/Models/TourSettings.cs deleted file mode 100644 index 9fe1814ff5..0000000000 --- a/src/Umbraco.Configuration/Models/TourSettings.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Umbraco.Core; -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Configuration.Models -{ - internal class TourSettings : ITourSettings - { - private const string Prefix = Constants.Configuration.ConfigPrefix + "Tours:"; - private readonly IConfiguration _configuration; - - public TourSettings(IConfiguration configuration) - { - _configuration = configuration; - } - - public string Type { get; set; } - - public bool EnableTours => _configuration.GetValue(Prefix+"EnableTours", true); - } -} diff --git a/src/Umbraco.Configuration/UmbracoSettings/BackOfficeElement.cs b/src/Umbraco.Configuration/UmbracoSettings/BackOfficeElement.cs deleted file mode 100644 index 46b9bf32a9..0000000000 --- a/src/Umbraco.Configuration/UmbracoSettings/BackOfficeElement.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class BackOfficeElement : UmbracoConfigurationElement, IBackOfficeSection - { - [ConfigurationProperty("tours")] - internal TourConfigElement Tours => (TourConfigElement)this["tours"]; - - ITourSettings IBackOfficeSection.Tours => Tours; - } -} diff --git a/src/Umbraco.Configuration/UmbracoSettings/KeepAliveElement.cs b/src/Umbraco.Configuration/UmbracoSettings/KeepAliveElement.cs deleted file mode 100644 index 2297fb4e20..0000000000 --- a/src/Umbraco.Configuration/UmbracoSettings/KeepAliveElement.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class KeepAliveElement : ConfigurationElement, IKeepAliveSettings - { - [ConfigurationProperty("disableKeepAliveTask", DefaultValue = "false")] - public bool DisableKeepAliveTask => (bool)base["disableKeepAliveTask"]; - - [ConfigurationProperty("keepAlivePingUrl", DefaultValue = "{umbracoApplicationUrl}/api/keepalive/ping")] - public string KeepAlivePingUrl => (string)base["keepAlivePingUrl"]; - } -} diff --git a/src/Umbraco.Configuration/UmbracoSettings/TourConfigElement.cs b/src/Umbraco.Configuration/UmbracoSettings/TourConfigElement.cs deleted file mode 100644 index f75b71fc57..0000000000 --- a/src/Umbraco.Configuration/UmbracoSettings/TourConfigElement.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class TourConfigElement : UmbracoConfigurationElement, ITourSettings - { - //disabled by default so that upgraders don't get it enabled by default - // TODO: we probably just want to disable the initial one from automatically loading ? - [ConfigurationProperty("enable", DefaultValue = false)] - public bool EnableTours => (bool)this["enable"]; - - // TODO: We could have additional filters, etc... defined here - } -} diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs index 781d00b979..944f18c3f1 100644 --- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs +++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs @@ -4,8 +4,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings { internal class UmbracoSettingsSection : ConfigurationSection { - [ConfigurationProperty("backOffice")] - public BackOfficeElement BackOffice => (BackOfficeElement)this["backOffice"]; [ConfigurationProperty("content")] public ContentElement Content => (ContentElement)this["content"]; @@ -22,7 +20,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings [ConfigurationProperty("web.routing")] public WebRoutingElement WebRouting => (WebRoutingElement)this["web.routing"]; - [ConfigurationProperty("keepAlive")] - internal KeepAliveElement KeepAlive => (KeepAliveElement)this["keepAlive"]; } } diff --git a/src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs b/src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs deleted file mode 100644 index b3e2854a0d..0000000000 --- a/src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Umbraco.Core.Configuration -{ - public interface IIndexCreatorSettings - { - string LuceneDirectoryFactory { get; } - } -} diff --git a/src/Umbraco.Core/Configuration/INuCacheSettings.cs b/src/Umbraco.Core/Configuration/INuCacheSettings.cs deleted file mode 100644 index c6524297a6..0000000000 --- a/src/Umbraco.Core/Configuration/INuCacheSettings.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Umbraco.Core.Configuration -{ - public interface INuCacheSettings - { - string BTreeBlockSize { get; } - } -} diff --git a/src/Umbraco.Core/Configuration/Models/KeepAliveSettings.cs b/src/Umbraco.Core/Configuration/Models/KeepAliveSettings.cs index 188c4c5739..01d3b36a5d 100644 --- a/src/Umbraco.Core/Configuration/Models/KeepAliveSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/KeepAliveSettings.cs @@ -1,11 +1,9 @@ -using Umbraco.Core.Configuration.UmbracoSettings; - namespace Umbraco.Core.Configuration.Models { - public class KeepAliveSettings : IKeepAliveSettings + public class KeepAliveSettings { - public bool DisableKeepAliveTask { get; set; } = false; + public bool DisableKeepAliveTask => false; - public string KeepAlivePingUrl { get; set; } = "{umbracoApplicationUrl}/api/keepalive/ping"; + public string KeepAlivePingUrl => "{umbracoApplicationUrl}/api/keepalive/ping"; } } diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs deleted file mode 100644 index 85df4540c0..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - public interface IBackOfficeSection - { - ITourSettings Tours { get; } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSettings.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSettings.cs deleted file mode 100644 index 58a8151474..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSettings.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - public interface IKeepAliveSettings : IUmbracoConfigurationSection - { - bool DisableKeepAliveTask { get; } - string KeepAlivePingUrl { get; } - } -} diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSettings.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSettings.cs deleted file mode 100644 index d3d8293140..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSettings.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - public interface ITourSettings - { - bool EnableTours { get; } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs index 1bec3d04f1..e1a969e668 100644 --- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs @@ -13,7 +13,6 @@ using Microsoft.Extensions.Options; using Serilog; using Serilog.Extensions.Hosting; using Serilog.Extensions.Logging; -using Umbraco.Configuration; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing;