From d05062fec06ecba1049beefffe8d8f521d3e1881 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 8 Oct 2021 15:40:13 +0200
Subject: [PATCH] Use new Random.Shared instead of creating new instances

---
 Emby.Server.Implementations/Dto/DtoService.cs                 | 2 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs           | 3 +--
 Jellyfin.Api/Controllers/MediaInfoController.cs               | 2 +-
 tests/Jellyfin.Extensions.Tests/ShuffleExtensionsTests.cs     | 4 +---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 74400b5128..ad76f3d6d4 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -420,7 +420,7 @@ namespace Emby.Server.Implementations.Dto
             // Just return something so that apps that are expecting a value won't think the folders are empty
             if (folder is ICollectionFolder || folder is UserView)
             {
-                return new Random().Next(1, 10);
+                return Random.Shared.Next(1, 10);
             }
 
             return folder.GetChildCount(user);
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index b2e555c7dc..08ed1a32ac 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -150,8 +150,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             if (!_lockkey.HasValue)
             {
-                var rand = new Random();
-                _lockkey = (uint)rand.Next();
+                _lockkey = (uint)Random.Shared.Next();
             }
 
             var lockKeyValue = _lockkey.Value;
diff --git a/Jellyfin.Api/Controllers/MediaInfoController.cs b/Jellyfin.Api/Controllers/MediaInfoController.cs
index 96ef2d678b..b422eb78c6 100644
--- a/Jellyfin.Api/Controllers/MediaInfoController.cs
+++ b/Jellyfin.Api/Controllers/MediaInfoController.cs
@@ -316,7 +316,7 @@ namespace Jellyfin.Api.Controllers
             byte[] buffer = ArrayPool<byte>.Shared.Rent(size);
             try
             {
-                new Random().NextBytes(buffer);
+                Random.Shared.NextBytes(buffer);
                 return File(buffer, MediaTypeNames.Application.Octet);
             }
             finally
diff --git a/tests/Jellyfin.Extensions.Tests/ShuffleExtensionsTests.cs b/tests/Jellyfin.Extensions.Tests/ShuffleExtensionsTests.cs
index c72216d94b..a73cfb0781 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();