From 65803e26456d374572a24223b6438b7f01818bdc Mon Sep 17 00:00:00 2001 From: Nathan Woulfe Date: Tue, 8 Nov 2022 01:01:11 +1000 Subject: [PATCH] add workflow to schema (#13349) * add workflow to schema * add licenses to CMSDefinition - intentionally only adding to schema, not registered as options --- src/JsonSchema/AppSettings.cs | 9 ++++++--- src/JsonSchema/appsettings-schema.json | 11 +++++++++++ .../Configuration/Models/LicensesSettings.cs | 11 +++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 src/Umbraco.Core/Configuration/Models/LicensesSettings.cs diff --git a/src/JsonSchema/AppSettings.cs b/src/JsonSchema/AppSettings.cs index a8ea2f5dbb..f9c7c224be 100644 --- a/src/JsonSchema/AppSettings.cs +++ b/src/JsonSchema/AppSettings.cs @@ -12,11 +12,12 @@ internal class AppSettings public CmsDefinition? CMS { get; set; } /// - /// Configurations for the Umbraco CMS + /// Configurations for the Umbraco CMS /// public class CmsDefinition { public ContentSettings? Content { get; set; } + public CoreDebugSettings? Debug { get; set; } public ExceptionFilterSettings? ExceptionFilter { get; set; } @@ -37,7 +38,7 @@ internal class AppSettings public LoggingSettings? Logging { get; set; } - public NuCacheSettings? NuCache { get; set; } + public NuCacheSettings? NuCache { get; set; } public RequestHandlerSettings? RequestHandler { get; set; } @@ -49,7 +50,7 @@ internal class AppSettings public TypeFinderSettings? TypeFinder { get; set; } - public WebRoutingSettings? WebRouting { get; set; } + public WebRoutingSettings? WebRouting { get; set; } public UmbracoPluginSettings? Plugins { get; set; } @@ -72,5 +73,7 @@ internal class AppSettings public InstallDefaultDataSettings? DefaultDataCreation { get; set; } public DataTypesSettings? DataTypes { get; set; } + + public LicensesSettings? Licenses { get; set; } } } diff --git a/src/JsonSchema/appsettings-schema.json b/src/JsonSchema/appsettings-schema.json index 95c9a9b4c1..44b006b853 100644 --- a/src/JsonSchema/appsettings-schema.json +++ b/src/JsonSchema/appsettings-schema.json @@ -41,6 +41,17 @@ "$ref": "appsettings-schema.Umbraco.Deploy.json#/definitions/JsonSchemaDeployDefinition" } ] + }, + "Workflow": { + "description": "Configuration of Umbraco Workflow", + "oneOf": [ + { + "type": "null" + }, + { + "$ref": "appsettings-schema.Umbraco.Workflow.json#/definitions/JsonSchemaWorkflowDefinition" + } + ] } } } diff --git a/src/Umbraco.Core/Configuration/Models/LicensesSettings.cs b/src/Umbraco.Core/Configuration/Models/LicensesSettings.cs new file mode 100644 index 0000000000..f8de1d7265 --- /dev/null +++ b/src/Umbraco.Core/Configuration/Models/LicensesSettings.cs @@ -0,0 +1,11 @@ +// Copyright (c) Umbraco. +// See LICENSE for more details. + +namespace Umbraco.Cms.Core.Configuration.Models; + +/// +/// Typed configuration options for license settings. +/// +public class LicensesSettings : Dictionary +{ +}