Merge branch 'v10/dev' into v10/feature/variant-permissions

src/Umbraco.Core/Configuration/Models/GlobalSettings.cs

@@ -33,6 +33,7 @@ public class GlobalSettings
     internal const string StaticDistributedLockingWriteLockDefaultTimeout = "00:00:05";
     internal const bool StaticSanitizeTinyMce = false;
     internal const int StaticMainDomReleaseSignalPollingInterval = 2000;
+    private const bool StaticForceCombineUrlPathLeftToRight = true;
 
     /// <summary>
     ///     Gets or sets a value for the reserved URLs (must end with a comma).
@@ -226,7 +227,25 @@ public class GlobalSettings
         TimeSpan.Parse(StaticDistributedLockingWriteLockDefaultTimeout);
 
     /// <summary>
-    ///     Gets or sets a value representing the DistributedLockingMechanism to use.
+    /// Gets or sets a value representing the DistributedLockingMechanism to use.
     /// </summary>
     public string DistributedLockingMechanism { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Force url paths to be left to right, even when the culture has right to left text
+    /// </summary>
+    /// <example>
+    /// For the following hierarchy
+    /// - Root (/ar)
+    ///   - 1 (/ar/1)
+    ///     - 2 (/ar/1/2)
+    ///       - 3 (/ar/1/2/3)
+    ///         - 3 (/ar/1/2/3/4)
+    /// When forced
+    /// - https://www.umbraco.com/ar/1/2/3/4
+    /// when not
+    /// - https://www.umbraco.com/ar/4/3/2/1
+    /// </example>
+    [DefaultValue(StaticForceCombineUrlPathLeftToRight)]
+    public bool ForceCombineUrlPathLeftToRight { get; set; }  = StaticForceCombineUrlPathLeftToRight;
 }

src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs

@@ -50,11 +50,11 @@ public class ModelsBuilderSettings
             }
 
             return _flagOutOfDateModels;
-            }
-
-            set =>_flagOutOfDateModels = value;
         }
 
+            set => _flagOutOfDateModels = value;
+    }
+
 
     /// <summary>
     ///     Gets or sets a value for the models directory.

src/Umbraco.Core/Configuration/Models/RuntimeMode.cs

@@ -0,0 +1,22 @@
+namespace Umbraco.Cms.Core.Configuration.Models;
+
+/// <summary>
+/// Represents the configured Umbraco runtime mode.
+/// </summary>
+public enum RuntimeMode
+{
+    /// <summary>
+    /// The backoffice development mode ensures the runtime is configured for rapidly applying changes within the backoffice.
+    /// </summary>
+    BackofficeDevelopment = 0,
+
+    /// <summary>
+    /// The development mode ensures the runtime is configured for rapidly applying changes.
+    /// </summary>
+    Development = 1,
+
+    /// <summary>
+    /// The production mode ensures optimal performance settings are configured and denies any changes that would require recompilations.
+    /// </summary>
+    Production = 2
+}

src/Umbraco.Core/Configuration/Models/RuntimeSettings.cs

@@ -1,16 +1,24 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System.ComponentModel;
+
 namespace Umbraco.Cms.Core.Configuration.Models;
 
 /// <summary>
-///     Typed configuration options for runtime settings.
+/// Typed configuration options for runtime settings.
 /// </summary>
 [UmbracoOptions(Constants.Configuration.ConfigRuntime)]
 public class RuntimeSettings
 {
     /// <summary>
-    ///     Gets or sets a value for the maximum query string length.
+    /// Gets or sets the runtime mode.
+    /// </summary>
+    [DefaultValue(RuntimeMode.BackofficeDevelopment)]
+    public RuntimeMode Mode { get; set; } = RuntimeMode.BackofficeDevelopment;
+
+    /// <summary>
+    /// Gets or sets a value for the maximum query string length.
     /// </summary>
     public int? MaxQueryStringLength { get; set; }