From 94bf4efe10eba00f47c0e58f2740b7c75f5c44fe Mon Sep 17 00:00:00 2001 From: Mole Date: Tue, 23 Apr 2024 11:17:50 +0200 Subject: [PATCH] V14: Obsolete runtime minification settings (#16123) * Obsolete RuntimeMinificationSettings * Obsolete RuntimeMinificationValidator * Update src/Umbraco.Core/Constants-Configuration.cs Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> * Obsolete RuntimeMinificationCacheBuster --------- Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> --- .../Configuration/Models/RuntimeMinificationCacheBuster.cs | 1 + .../Configuration/Models/RuntimeMinificationSettings.cs | 1 + src/Umbraco.Core/Constants-Configuration.cs | 2 ++ .../DependencyInjection/UmbracoBuilder.CoreServices.cs | 1 - .../RuntimeModeValidators/RuntimeMinificationValidator.cs | 1 + tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Configuration/Models/RuntimeMinificationCacheBuster.cs b/src/Umbraco.Core/Configuration/Models/RuntimeMinificationCacheBuster.cs index 37426fa84f..b86b57ee3a 100644 --- a/src/Umbraco.Core/Configuration/Models/RuntimeMinificationCacheBuster.cs +++ b/src/Umbraco.Core/Configuration/Models/RuntimeMinificationCacheBuster.cs @@ -1,5 +1,6 @@ namespace Umbraco.Cms.Core.Configuration.Models; +[Obsolete("Runtime minification is no longer supported. Will be removed entirely in V16.")] public enum RuntimeMinificationCacheBuster { Version, diff --git a/src/Umbraco.Core/Configuration/Models/RuntimeMinificationSettings.cs b/src/Umbraco.Core/Configuration/Models/RuntimeMinificationSettings.cs index 6ec84ffe1e..cff3d9d5da 100644 --- a/src/Umbraco.Core/Configuration/Models/RuntimeMinificationSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/RuntimeMinificationSettings.cs @@ -2,6 +2,7 @@ using System.ComponentModel; namespace Umbraco.Cms.Core.Configuration.Models; +[Obsolete("Runtime minification is no longer supported. Will be removed entirely in V16.")] [UmbracoOptions(Constants.Configuration.ConfigRuntimeMinification)] public class RuntimeMinificationSettings { diff --git a/src/Umbraco.Core/Constants-Configuration.cs b/src/Umbraco.Core/Constants-Configuration.cs index e864b6041c..459becd320 100644 --- a/src/Umbraco.Core/Constants-Configuration.cs +++ b/src/Umbraco.Core/Constants-Configuration.cs @@ -48,7 +48,9 @@ public static partial class Constants public const string ConfigRequestHandler = ConfigPrefix + "RequestHandler"; public const string ConfigRuntime = ConfigPrefix + "Runtime"; public const string ConfigRuntimeMode = ConfigRuntime + ":Mode"; + [Obsolete("Runtime minification is no longer supported. Will be removed entirely in V16.")] public const string ConfigRuntimeMinification = ConfigPrefix + "RuntimeMinification"; + [Obsolete("Runtime minification is no longer supported. Will be removed entirely in V16.")] public const string ConfigRuntimeMinificationVersion = ConfigRuntimeMinification + ":Version"; public const string ConfigSecurity = ConfigPrefix + "Security"; public const string ConfigBasicAuth = ConfigPrefix + "BasicAuth"; diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs index c95576395e..b2b38dd3c7 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs @@ -93,7 +93,6 @@ public static partial class UmbracoBuilderExtensions .Add() .Add() .Add() - .Add() .Add(); // composers diff --git a/src/Umbraco.Infrastructure/Runtime/RuntimeModeValidators/RuntimeMinificationValidator.cs b/src/Umbraco.Infrastructure/Runtime/RuntimeModeValidators/RuntimeMinificationValidator.cs index 01bc0dd3dc..ce593704fc 100644 --- a/src/Umbraco.Infrastructure/Runtime/RuntimeModeValidators/RuntimeMinificationValidator.cs +++ b/src/Umbraco.Infrastructure/Runtime/RuntimeModeValidators/RuntimeMinificationValidator.cs @@ -8,6 +8,7 @@ namespace Umbraco.Cms.Infrastructure.Runtime.RuntimeModeValidators; /// Validates whether the runtime minification cache buster is not set to when in production runtime mode. /// /// +[Obsolete("Runtime minification is no longer supported, so this is no longer relevant. Will be removed entirely in V16.")] public class RuntimeMinificationValidator : RuntimeModeProductionValidatorBase { private readonly IOptionsMonitor _runtimeMinificationSettings; diff --git a/tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs b/tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs index 5a65dc93d2..7c1d4d852a 100644 --- a/tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs +++ b/tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs @@ -60,6 +60,7 @@ internal class UmbracoCmsSchema public required RichTextEditorSettings RichTextEditor { get; set; } + [Obsolete("Runtime minification is no longer supported. Will be removed entirely in V16.")] public required RuntimeMinificationSettings RuntimeMinification { get; set; } public required BasicAuthSettings BasicAuth { get; set; }