Remove Hex class as the BCL has one now

Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs

@@ -647,7 +647,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         {
             using var options = new HttpRequestMessage(HttpMethod.Post, ApiUrl + "/token");
             var hashedPasswordBytes = _cryptoProvider.ComputeHash("SHA1", Encoding.ASCII.GetBytes(password), Array.Empty<byte>());
-            string hashedPassword = Hex.Encode(hashedPasswordBytes);
+            string hashedPassword = Convert.ToHexString(hashedPasswordBytes);
             options.Content = new StringContent("{\"username\":\"" + username + "\",\"password\":\"" + hashedPassword + "\"}", Encoding.UTF8, MediaTypeNames.Application.Json);
 
             using var response = await Send(options, false, null, cancellationToken).ConfigureAwait(false);

Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs

@@ -243,7 +243,7 @@ namespace Emby.Server.Implementations.QuickConnect
             Span<byte> bytes = stackalloc byte[length];
             _rng.GetBytes(bytes);
 
-            return Hex.Encode(bytes);
+            return Convert.ToHexString(bytes);
         }
 
         /// <inheritdoc/>

Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -414,7 +414,7 @@ namespace Emby.Server.Implementations.Updates
             using var md5 = MD5.Create();
             cancellationToken.ThrowIfCancellationRequested();
 
-            var hash = Hex.Encode(md5.ComputeHash(stream));
+            var hash = Convert.ToHexString(md5.ComputeHash(stream));
             if (!string.Equals(package.Checksum, hash, StringComparison.OrdinalIgnoreCase))
             {
                 _logger.LogError(

Jellyfin.Api/Controllers/LiveTvController.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
@@ -17,7 +17,6 @@ using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Api.Models.LiveTvDtos;
 using Jellyfin.Data.Enums;
-using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Dto;
@@ -1015,7 +1014,7 @@ namespace Jellyfin.Api.Controllers
             if (!string.IsNullOrEmpty(pw))
             {
                 using var sha = SHA1.Create();
-                listingsProviderInfo.Password = Hex.Encode(sha.ComputeHash(Encoding.UTF8.GetBytes(pw)));
+                listingsProviderInfo.Password = Convert.ToHexString(sha.ComputeHash(Encoding.UTF8.GetBytes(pw)));
             }
 
             return await _liveTvManager.SaveListingProvider(listingsProviderInfo, validateLogin, validateListings).ConfigureAwait(false);

MediaBrowser.Common/Cryptography/PasswordHash.cs

@@ -101,13 +101,13 @@ namespace MediaBrowser.Common.Cryptography
             // Check if the string also contains a salt
             if (splitted.Length - index == 2)
             {
-                salt = Hex.Decode(splitted[index++]);
+                salt = Convert.FromHexString(splitted[index++]);
-                hash = Hex.Decode(splitted[index++]);
+                hash = Convert.FromHexString(splitted[index++]);
             }
             else
             {
                 salt = Array.Empty<byte>();
-                hash = Hex.Decode(splitted[index++]);
+                hash = Convert.FromHexString(splitted[index++]);
             }
 
             return new PasswordHash(id, hash, salt, parameters);
@@ -144,11 +144,11 @@ namespace MediaBrowser.Common.Cryptography
             if (_salt.Length != 0)
             {
                 str.Append('$')
-                    .Append(Hex.Encode(_salt, false));
+                    .Append(Convert.ToHexString(_salt));
             }
 
             return str.Append('$')
-                .Append(Hex.Encode(_hash, false)).ToString();
+                .Append(Convert.ToHexString(_hash)).ToString();
         }
     }
 }

MediaBrowser.Common/Hex.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace MediaBrowser.Common
-{
-    /// <summary>
-    /// Encoding and decoding hex strings.
-    /// </summary>
-    public static class Hex
-    {
-        internal const string HexCharsLower = "0123456789abcdef";
-        internal const string HexCharsUpper = "0123456789ABCDEF";
-
-        internal const int LastHexSymbol = 0x66; // 102: f
-
-        /// <summary>
-        /// Gets a map from an ASCII char to its hex value shifted,
-        /// e.g. <c>b</c> -> 11. 0xFF means it's not a hex symbol.
-        /// </summary>
-        internal static ReadOnlySpan<byte> HexLookup => new byte[]
-        {
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0xFF, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-        };
-
-        /// <summary>
-        /// Encodes each element of the specified bytes as its hexadecimal string representation.
-        /// </summary>
-        /// <param name="bytes">An array of bytes.</param>
-        /// <param name="lowercase"><c>true</c> to use lowercase hexadecimal characters; otherwise <c>false</c>.</param>
-        /// <returns><c>bytes</c> as a hex string.</returns>
-        public static string Encode(ReadOnlySpan<byte> bytes, bool lowercase = true)
-        {
-            var hexChars = lowercase ? HexCharsLower : HexCharsUpper;
-
-            // TODO: use string.Create when it's supports spans
-            // Ref: https://github.com/dotnet/corefx/issues/29120
-            char[] s = new char[bytes.Length * 2];
-            int j = 0;
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                s[j++] = hexChars[bytes[i] >> 4];
-                s[j++] = hexChars[bytes[i] & 0x0f];
-            }
-
-            return new string(s);
-        }
-
-        /// <summary>
-        /// Decodes a hex string into bytes.
-        /// </summary>
-        /// <param name="str">The <see cref="string" />.</param>
-        /// <returns>The decoded bytes.</returns>
-        public static byte[] Decode(ReadOnlySpan<char> str)
-        {
-            if (str.Length == 0)
-            {
-                return Array.Empty<byte>();
-            }
-
-            var unHex = HexLookup;
-
-            int byteLen = str.Length / 2;
-            byte[] bytes = new byte[byteLen];
-            int i = 0;
-            for (int j = 0; j < byteLen; j++)
-            {
-                byte a;
-                byte b;
-                if (str[i] > LastHexSymbol
-                    || (a = unHex[str[i++]]) == 0xFF
-                    || str[i] > LastHexSymbol
-                    || (b = unHex[str[i++]]) == 0xFF)
-                {
-                    ThrowArgumentException(nameof(str));
-                    break; // Unreachable
-                }
-
-                bytes[j] = (byte)((a * 16) | b);
-            }
-
-            return bytes;
-        }
-
-        [DoesNotReturn]
-        private static void ThrowArgumentException(string paramName)
-            => throw new ArgumentException("Character is not a hex symbol.", paramName);
-    }
-}

benches/Jellyfin.Common.Benches/HexDecodeBenches.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Globalization;
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Running;
-using MediaBrowser.Common;
-
-namespace Jellyfin.Common.Benches
-{
-    [MemoryDiagnoser]
-    public class HexDecodeBenches
-    {
-        private string _data;
-
-        [Params(0, 10, 100, 1000, 10000, 1000000)]
-        public int N { get; set; }
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            var bytes = new byte[N];
-            new Random(42).NextBytes(bytes);
-            _data = Hex.Encode(bytes);
-        }
-
-        [Benchmark]
-        public byte[] Decode() => Hex.Decode(_data);
-
-        [Benchmark]
-        public byte[] DecodeSubString() => DecodeSubString(_data);
-
-        private static byte[] DecodeSubString(string str)
-        {
-            byte[] bytes = new byte[str.Length / 2];
-            for (int i = 0; i < str.Length; i += 2)
-            {
-                bytes[i / 2] = byte.Parse(
-                    str.Substring(i, 2),
-                    NumberStyles.HexNumber,
-                    CultureInfo.InvariantCulture);
-            }
-
-            return bytes;
-        }
-    }
-}

benches/Jellyfin.Common.Benches/HexEncodeBenches.cs

@@ -1,32 +0,0 @@
-using System;
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Running;
-using MediaBrowser.Common;
-
-namespace Jellyfin.Common.Benches
-{
-    [MemoryDiagnoser]
-    public class HexEncodeBenches
-    {
-        private byte[] _data;
-
-        [Params(0, 10, 100, 1000, 10000, 1000000)]
-        public int N { get; set; }
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            _data = new byte[N];
-            new Random(42).NextBytes(_data);
-        }
-
-        [Benchmark]
-        public string HexEncode() => Hex.Encode(_data);
-
-        [Benchmark]
-        public string BitConverterToString() => BitConverter.ToString(_data);
-
-        [Benchmark]
-        public string BitConverterToStringWithReplace() => BitConverter.ToString(_data).Replace("-", "");
-    }
-}

benches/Jellyfin.Common.Benches/Jellyfin.Common.Benches.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../MediaBrowser.Common/MediaBrowser.Common.csproj" />
-  </ItemGroup>
-
-</Project>

benches/Jellyfin.Common.Benches/Program.cs

@@ -1,14 +0,0 @@
-using System;
-using BenchmarkDotNet.Running;
-
-namespace Jellyfin.Common.Benches
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-            _ = BenchmarkRunner.Run<HexEncodeBenches>();
-            _ = BenchmarkRunner.Run<HexDecodeBenches>();
-        }
-    }
-}

tests/Jellyfin.Common.Tests/HexTests.cs

@@ -1,19 +0,0 @@
-using MediaBrowser.Common;
-using Xunit;
-
-namespace Jellyfin.Common.Tests
-{
-    public class HexTests
-    {
-        [Theory]
-        [InlineData("")]
-        [InlineData("00")]
-        [InlineData("01")]
-        [InlineData("000102030405060708090a0b0c0d0e0f")]
-        [InlineData("0123456789abcdef")]
-        public void RoundTripTest(string data)
-        {
-            Assert.Equal(data, Hex.Encode(Hex.Decode(data)));
-        }
-    }
-}

tests/Jellyfin.Common.Tests/PasswordHashTests.cs

@@ -1,3 +1,4 @@
+using System;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Cryptography;
 using Xunit;
@@ -16,8 +17,8 @@ namespace Jellyfin.Common.Tests
         {
             var pass = PasswordHash.Parse(passwordHash);
             Assert.Equal(id, pass.Id);
-            Assert.Equal(salt, Hex.Encode(pass.Salt, false));
+            Assert.Equal(salt, Convert.ToHexString(pass.Salt));
-            Assert.Equal(hash, Hex.Encode(pass.Hash, false));
+            Assert.Equal(hash, Convert.ToHexString(pass.Hash));
         }
 
         [Theory]