Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 1 insertions, 3 deletions

diff --git a/tests/Jellyfin.Extensions.Tests/ShuffleExtensionsTests.cs b/tests/Jellyfin.Extensions.Tests/ShuffleExtensionsTests.cs
index c72216d94..a73cfb078 100644
--- a/tests/Jellyfin.Extensions.Tests/ShuffleExtensionsTests.cs
+++ b/tests/Jellyfin.Extensions.Tests/ShuffleExtensionsTests.cs
@@ -5,13 +5,11 @@ namespace Jellyfin.Extensions.Tests
 {
     public static class ShuffleExtensionsTests
     {
-        private static readonly Random _rng = new Random();
-
         [Fact]
         public static void Shuffle_Valid_Correct()
         {
             byte[] original = new byte[1 << 6];
-            _rng.NextBytes(original);
+            Random.Shared.NextBytes(original);
             byte[] shuffled = (byte[])original.Clone();
             shuffled.Shuffle();