Merge remote-tracking branch 'upstream/master' into baseitemkind-fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Sorting/AlphanumComparator.cs b/MediaBrowser.Controller/Sorting/AlphanumComparator.cs
index 70cb9eebe..e00cadca2 100644
--- a/MediaBrowser.Controller/Sorting/AlphanumComparator.cs
+++ b/MediaBrowser.Controller/Sorting/AlphanumComparator.cs
@@ -1,7 +1,5 @@
 #pragma warning disable CS1591
 
-#nullable enable
-
 using System;
 using System.Collections.Generic;
 
@@ -123,7 +121,9 @@ namespace MediaBrowser.Controller.Sorting
                         return result;
                     }
                 }
+#pragma warning disable SA1500 // TODO remove with StyleCop.Analyzers v1.2.0 https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3196
             } while (pos1 < len1 && pos2 < len2);
+#pragma warning restore SA1500
 
             return len1 - len2;
         }