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

# Conflicts: # src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
2023-03-29 10:29:44 +02:00
parent f8e5205aa7 83ad463e81
commit 61a33c734c
22 changed files with 3872 additions and 49 deletions
--- a/src/Umbraco.Core/Extensions/StringExtensions.cs
+++ b/src/Umbraco.Core/Extensions/StringExtensions.cs
@@ -1040,14 +1040,15 @@ public static class StringExtensions
            throw new ArgumentNullException(nameof(text));
        }

-        var pos = text.IndexOf(search, StringComparison.InvariantCulture);
+        ReadOnlySpan<char> spanText = text.AsSpan();
+        var pos = spanText.IndexOf(search, StringComparison.InvariantCulture);

        if (pos < 0)
        {
            return text;
        }

-        return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
+        return string.Concat(spanText[..pos], replace.AsSpan(), spanText[(pos + search.Length)..]);
    }

    /// <summary>