Merge remote-tracking branch 'origin/v9/dev' into v9/task/package-refactor

# Conflicts:
#	src/Umbraco.Core/Migrations/IMigration.cs
#	src/Umbraco.Core/Migrations/MigrationPlan.cs
#	src/Umbraco.Infrastructure/Migrations/IMigrationContext.cs
#	src/Umbraco.Infrastructure/Runtime/RuntimeState.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml

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

@@ -0,0 +1,14 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+namespace Umbraco.Cms.Core.Configuration.Models
+{
+    /// <summary>
+    /// The serializer type that nucache uses to persist documents in the database.
+    /// </summary>
+    public enum NuCacheSerializerType
+    {
+        MessagePack = 1, // Default
+        JSON = 2
+    }
+}

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

@@ -12,5 +12,15 @@ namespace Umbraco.Cms.Core.Configuration.Models
         /// Gets or sets a value defining the BTree block size.
         /// </summary>
         public int? BTreeBlockSize { get; set; }
+
+        /// <summary>
+        /// The serializer type that nucache uses to persist documents in the database.
+        /// </summary>
+        public NuCacheSerializerType NuCacheSerializerType { get; set; } = NuCacheSerializerType.MessagePack;
+
+        /// <summary>
+        /// The paging size to use for nucache SQL queries.
+        /// </summary>
+        public int SqlPageSize { get; set; } = 1000;
     }
 }