diff --git a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpEnumerableExtensions.cs b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpEnumerableExtensions.cs
index dc177afbd14..7796989bcfc 100644
--- a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpEnumerableExtensions.cs
+++ b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpEnumerableExtensions.cs
@@ -2,7 +2,7 @@
 
 namespace System.Collections.Generic;
 
-/// <summary> 
+/// <summary>
 /// Extension methods for <see cref="IEnumerable{T}"/>.
 /// </summary>
 public static class AbpEnumerableExtensions
@@ -59,4 +59,24 @@ public static IEnumerable<T> WhereIf<T>(this IEnumerable<T> source, bool conditi
             ? source.Where(predicate)
             : source;
     }
+
+    /// <summary>
+    /// Shuffles the given <paramref name="source"/> using Fisher-Yates algorithm.
+    /// </summary>
+    /// <param name="source">The source to shuffle</param>
+    /// <param name="rng">Random number generator</param>
+    /// <returns>Shuffled enumerable</returns>
+    public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> source, Random rng)
+    {
+        var elements = source.ToArray();
+        for (var i = elements.Length - 1; i >= 0; i--)
+        {
+            // Swap element "i" with a random earlier element it (or itself)
+            // ... except we don't really need to swap it fully, as we can
+            // return it immediately, and afterwards it's irrelevant.
+            var swapIndex = rng.Next(i + 1);
+            yield return elements[swapIndex];
+            elements[swapIndex] = elements[i];
+        }
+    }
 }
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs
index 0a5b3ffd05b..86100d5d3cd 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp;
 /// </summary>
 public static class RandomHelper
 {
-    private static readonly Random Rnd = new Random();
+    private readonly static Random Rnd = new Random();
 
     /// <summary>
     /// Returns a random number within a specified range.
@@ -19,16 +19,20 @@ public static class RandomHelper
     /// <param name="minValue">The inclusive lower bound of the random number returned.</param>
     /// <param name="maxValue">The exclusive upper bound of the random number returned. maxValue must be greater than or equal to minValue.</param>
     /// <returns>
-    /// A 32-bit signed integer greater than or equal to minValue and less than maxValue; 
-    /// that is, the range of return values includes minValue but not maxValue. 
+    /// A 32-bit signed integer greater than or equal to minValue and less than maxValue;
+    /// that is, the range of return values includes minValue but not maxValue.
     /// If minValue equals maxValue, minValue is returned.
     /// </returns>
     public static int GetRandom(int minValue, int maxValue)
     {
+#if NETSTANDARD2_0 || NETSTANDARD2_1
         lock (Rnd)
         {
             return Rnd.Next(minValue, maxValue);
         }
+#else
+        return Random.Shared.Next(minValue, maxValue);
+#endif
     }
 
     /// <summary>
@@ -36,16 +40,20 @@ public static int GetRandom(int minValue, int maxValue)
     /// </summary>
     /// <param name="maxValue">The exclusive upper bound of the random number to be generated. maxValue must be greater than or equal to zero.</param>
     /// <returns>
-    /// A 32-bit signed integer greater than or equal to zero, and less than maxValue; 
-    /// that is, the range of return values ordinarily includes zero but not maxValue. 
+    /// A 32-bit signed integer greater than or equal to zero, and less than maxValue;
+    /// that is, the range of return values ordinarily includes zero but not maxValue.
     /// However, if maxValue equals zero, maxValue is returned.
     /// </returns>
     public static int GetRandom(int maxValue)
     {
+#if NETSTANDARD2_0 || NETSTANDARD2_1
         lock (Rnd)
         {
             return Rnd.Next(maxValue);
         }
+#else
+        return Random.Shared.Next(maxValue);
+#endif
     }
 
     /// <summary>
@@ -54,10 +62,14 @@ public static int GetRandom(int maxValue)
     /// <returns>A 32-bit signed integer greater than or equal to zero and less than <see cref="int.MaxValue"/>.</returns>
     public static int GetRandom()
     {
+#if NETSTANDARD2_0 || NETSTANDARD2_1
         lock (Rnd)
         {
             return Rnd.Next();
         }
+#else
+        return Random.Shared.Next();
+#endif
     }
 
     /// <summary>
@@ -91,18 +103,15 @@ public static T GetRandomOfList<T>([NotNull] IList<T> list)
     /// <param name="items">items</param>
     public static List<T> GenerateRandomizedList<T>([NotNull] IEnumerable<T> items)
     {
-        Check.NotNull(items, nameof(items));
-
-        var currentList = new List<T>(items);
-        var randomList = new List<T>();
-
-        while (currentList.Any())
+        var array = items.ToArray();
+#if NETSTANDARD2_0 || NETSTANDARD2_1
+        lock (Rnd)
         {
-            var randomIndex = RandomHelper.GetRandom(0, currentList.Count);
-            randomList.Add(currentList[randomIndex]);
-            currentList.RemoveAt(randomIndex);
+            return array.Shuffle(Rnd).ToList();
         }
-
-        return randomList;
+#else
+        Random.Shared.Shuffle(array);
+        return array.ToList();
+#endif
     }
 }