Merge remote-tracking branch 'origin/v11/dev' into v12/dev

# Conflicts:
#	src/Umbraco.Infrastructure/Scoping/Scope.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs

src/Umbraco.Infrastructure/Persistence/IUmbracoDatabase.cs

@@ -1,3 +1,4 @@
+using System.Data.Common;
 using NPoco;
 using Umbraco.Cms.Infrastructure.Migrations.Install;
 
@@ -33,4 +34,7 @@ public interface IUmbracoDatabase : IDatabase
     bool IsUmbracoInstalled();
 
     DatabaseSchemaResult ValidateSchema();
+
+    /// <returns>The number of rows affected.</returns>
+    int ExecuteNonQuery(DbCommand command) => command.ExecuteNonQuery();
 }

src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs

@@ -223,6 +223,14 @@ public class UmbracoDatabase : Database, IUmbracoDatabase
         return databaseSchemaValidationResult ?? new DatabaseSchemaResult();
     }
 
+    public int ExecuteNonQuery(DbCommand command)
+    {
+        OnExecutingCommand(command);
+        var i = command.ExecuteNonQuery();
+        OnExecutedCommand(command);
+        return i;
+    }
+
     /// <summary>
     ///     Returns true if Umbraco database tables are detected to be installed
     /// </summary>