Merge branch 'master' into scoped-displaypreferences

2 files changed, 6 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Sorting/AlphanumComparator.cs b/MediaBrowser.Controller/Sorting/AlphanumComparator.cs
index de7f72d1c..70cb9eebe 100644
--- a/MediaBrowser.Controller/Sorting/AlphanumComparator.cs
+++ b/MediaBrowser.Controller/Sorting/AlphanumComparator.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 #nullable enable
 
 using System;
@@ -127,7 +129,7 @@ namespace MediaBrowser.Controller.Sorting
         }
 
         /// <inheritdoc />
-        public int Compare(string x, string y)
+        public int Compare(string? x, string? y)
         {
             return CompareValues(x, y);
         }
diff --git a/MediaBrowser.Controller/Sorting/SortExtensions.cs b/MediaBrowser.Controller/Sorting/SortExtensions.cs
index 2a68f4678..88467814c 100644
--- a/MediaBrowser.Controller/Sorting/SortExtensions.cs
+++ b/MediaBrowser.Controller/Sorting/SortExtensions.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,6 +9,7 @@ namespace MediaBrowser.Controller.Sorting
     public static class SortExtensions
     {
         private static readonly AlphanumComparator _comparer = new AlphanumComparator();
+
         public static IEnumerable<T> OrderByString<T>(this IEnumerable<T> list, Func<T, string> getName)
         {
             return list.OrderBy(getName, _comparer);