Merge branch 'v11/dev' into v11/contrib

Author: nul800sebastiaan

build/azure-pipelines.yml

@@ -146,7 +146,7 @@ stages:
             inputs:
               targetType: inline
               script: |
-                choco install docfx --version=2.59.2 -y
+                choco install docfx --version=2.59.4 -y
                 if ($lastexitcode -ne 0){
                     throw ("Error installing DocFX")
                 }

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerSpecificMapperFactory.cs

@@ -0,0 +1,11 @@
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Infrastructure.Persistence;
+
+namespace Umbraco.Cms.Persistence.SqlServer.Services;
+
+public class SqlServerSpecificMapperFactory : IProviderSpecificMapperFactory
+{
+    public string ProviderName => Constants.ProviderName;
+
+    public NPocoMapperCollection Mappers => new(() => new[] { new UmbracoDefaultMapper() });
+}

src/Umbraco.Cms.Persistence.SqlServer/UmbracoBuilderExtensions.cs

@@ -22,6 +22,8 @@ public static class UmbracoBuilderExtensions
     /// </summary>
     public static IUmbracoBuilder AddUmbracoSqlServerSupport(this IUmbracoBuilder builder)
     {
+        builder.Services.TryAddEnumerable(ServiceDescriptor
+            .Singleton<IProviderSpecificMapperFactory, SqlServerSpecificMapperFactory>());
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ISqlSyntaxProvider, SqlServerSyntaxProvider>());
         builder.Services.TryAddEnumerable(ServiceDescriptor
             .Singleton<IBulkSqlInsertProvider, SqlServerBulkSqlInsertProvider>());

src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoGuidMapper.cs

@@ -1,3 +1,4 @@
+using System.Globalization;
 using NPoco;
 
 namespace Umbraco.Cms.Persistence.Sqlite.Mappers;
@@ -28,6 +29,24 @@ public class SqlitePocoGuidMapper : DefaultMapper
             };
         }
 
+        if (destType == typeof(decimal))
+        {
+            return value =>
+            {
+                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+                return result;
+            };
+        }
+
+        if (destType == typeof(decimal?))
+        {
+            return value =>
+            {
+                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+                return result;
+            };
+        }
+
         return base.GetFromDbConverter(destType, sourceType);
     }
 }

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

@@ -39,6 +39,6 @@ public class HealthChecksNotificationSettings
     /// <summary>
     ///     Gets or sets a value for the collection of health checks that are disabled for notifications.
     /// </summary>
-    public IEnumerable<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
-        Enumerable.Empty<DisabledHealthCheckSettings>();
+    public List<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
+        new List<DisabledHealthCheckSettings>();
 }

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

@@ -12,8 +12,8 @@ public class HealthChecksSettings
     /// <summary>
     ///     Gets or sets a value for the collection of healthchecks that are disabled.
     /// </summary>
-    public IEnumerable<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
-        Enumerable.Empty<DisabledHealthCheckSettings>();
+    public List<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
+        new List<DisabledHealthCheckSettings>();
 
     /// <summary>
     ///     Gets or sets a value for the healthcheck notification settings.

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

@@ -8,7 +8,7 @@ namespace Umbraco.Cms.Core.Configuration.Models;
 public class RichTextEditorSettings
 {
     internal const string StaticValidElements =
-        "+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*],figure,figcaption,video[*],audio[*],picture[*],source[*],canvas[*]";
+        "+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-s[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*],figure,figcaption,video[*],audio[*],picture[*],source[*],canvas[*]";
 
     internal const string StaticInvalidElements = "font";
 

src/Umbraco.Core/EmbeddedResources/Snippets/RegisterMember.cshtml

@@ -18,6 +18,9 @@
         // Set to true if you want the member editable properties shown.
         // It will only displays properties marked as "Member can edit" on the "Info" tab of the Member Type.
         .WithCustomProperties(false)
+        // By default the member will be logged in automatically after registration.
+        // Set this to false if the member should not be logged in automatically.
+        .WithAutomaticLogIn(true)
         .Build();
 
     var success = TempData["FormSuccess"] != null;
@@ -39,7 +42,8 @@ else
             new {
                 MemberTypeAlias = registerModel.MemberTypeAlias,
                 UsernameIsEmail = registerModel.UsernameIsEmail,
-                RedirectUrl = registerModel.RedirectUrl
+                RedirectUrl = registerModel.RedirectUrl,
+                AutomaticLogIn = registerModel.AutomaticLogIn
             }))
     {
         <h2>Create a new account.</h2>

src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs

@@ -36,7 +36,12 @@ public DatabaseConfigureStep(
 
     public override Task<InstallSetupResult?> ExecuteAsync(DatabaseModel databaseSettings)
     {
-        if (!_databaseBuilder.ConfigureDatabaseConnection(databaseSettings, false))
+        if (databaseSettings is null && string.IsNullOrWhiteSpace(_connectionStrings.CurrentValue.ConnectionString) is false)
+        {
+            return Task.FromResult<InstallSetupResult?>(null);
+        }
+
+        if (!_databaseBuilder.ConfigureDatabaseConnection(databaseSettings!, false))
         {
             throw new InstallException("Could not connect to the database");
         }

src/Umbraco.Infrastructure/Install/PackageMigrationRunner.cs

@@ -1,4 +1,7 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Migrations;
@@ -32,7 +35,8 @@ public PackageMigrationRunner(
         PackageMigrationPlanCollection packageMigrationPlans,
         IMigrationPlanExecutor migrationPlanExecutor,
         IKeyValueService keyValueService,
-        IEventAggregator eventAggregator)
+        IEventAggregator eventAggregator,
+        ILogger<PackageMigrationRunner> logger)
     {
         _profilingLogger = profilingLogger;
         _scopeProvider = scopeProvider;
@@ -43,6 +47,27 @@ public PackageMigrationRunner(
         _packageMigrationPlans = packageMigrationPlans.ToDictionary(x => x.Name);
     }
 
+    [Obsolete("Use constructor that takes ILogger, this will be removed in V13")]
+    public PackageMigrationRunner(
+        IProfilingLogger profilingLogger,
+        ICoreScopeProvider scopeProvider,
+        PendingPackageMigrations pendingPackageMigrations,
+        PackageMigrationPlanCollection packageMigrationPlans,
+        IMigrationPlanExecutor migrationPlanExecutor,
+        IKeyValueService keyValueService,
+        IEventAggregator eventAggregator)
+        : this(
+            profilingLogger,
+            scopeProvider,
+            pendingPackageMigrations,
+            packageMigrationPlans,
+            migrationPlanExecutor,
+            keyValueService,
+            eventAggregator,
+            StaticServiceProvider.Instance.GetRequiredService<ILogger<PackageMigrationRunner>>())
+    {
+    }
+
     /// <summary>
     ///     Runs all migration plans for a package name if any are pending.
     /// </summary>