From 6ae264174a513fb4d7b68bf2460f9bc649b6fdf9 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 18 Oct 2024 16:03:11 +0800
Subject: [PATCH] Use `Random.Shared.Shuffle` if possible.

---
 framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs
index 1d6815dbdb..86100d5d3c 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs
@@ -103,10 +103,15 @@ public static class RandomHelper
     /// <param name="items">items</param>
     public static List<T> GenerateRandomizedList<T>([NotNull] IEnumerable<T> items)
     {
+        var array = items.ToArray();
 #if NETSTANDARD2_0 || NETSTANDARD2_1
-        return items.Shuffle(Rnd).ToList();
+        lock (Rnd)
+        {
+            return array.Shuffle(Rnd).ToList();
+        }
 #else
-        return items.Shuffle(Random.Shared).ToList();
+        Random.Shared.Shuffle(array);
+        return array.ToList();
 #endif
     }
 }