Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/merge-v8-05032021

# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs

src/Umbraco.Web.Common/Extensions/HttpContextExtensions.cs

@@ -1,13 +1,27 @@
-using System;
+using System;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Umbraco.Cms.Core.Security;
 
 namespace Umbraco.Extensions
 {
     public static class HttpContextExtensions
     {
+        /// <summary>
+        /// Get the value in the request form or query string for the key
+        /// </summary>
+        public static string GetRequestValue(this HttpContext context, string key)
+        {
+            HttpRequest request = context.Request;
+            if (!request.HasFormContentType)
+            {
+                return request.Query[key];
+            }
+
+            string value = request.Form[key];
+            return value ?? request.Query[key];
+        }
+
         public static void SetPrincipalForRequest(this HttpContext context, ClaimsPrincipal principal)
         {
             context.User = principal;