Merge branch 'master' into userdb-efcore

# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs

7 files changed, 13 insertions, 13 deletions

diff --git a/MediaBrowser.Model/Services/ApiMemberAttribute.cs b/MediaBrowser.Model/Services/ApiMemberAttribute.cs
index 8e50836f4d..7c23eee448 100644
--- a/MediaBrowser.Model/Services/ApiMemberAttribute.cs
+++ b/MediaBrowser.Model/Services/ApiMemberAttribute.cs
@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 
 namespace MediaBrowser.Model.Services
diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
index 3e49e9872d..b83d3b0756 100644
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ b/MediaBrowser.Model/Services/IHasRequestFilter.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Model.Services
     public interface IHasRequestFilter
     {
         /// <summary>
-        /// Order in which Request Filters are executed.
+        /// Gets the order in which Request Filters are executed.
         /// &lt;0 Executed before global request filters.
         /// &gt;0 Executed after global request filters.
         /// </summary>
diff --git a/MediaBrowser.Model/Services/IHttpRequest.cs b/MediaBrowser.Model/Services/IHttpRequest.cs
index 4dccd2d686..3ea65195cd 100644
--- a/MediaBrowser.Model/Services/IHttpRequest.cs
+++ b/MediaBrowser.Model/Services/IHttpRequest.cs
@@ -5,12 +5,12 @@ namespace MediaBrowser.Model.Services
     public interface IHttpRequest : IRequest
     {
         /// <summary>
-        /// The HTTP Verb
+        /// Gets the HTTP Verb.
         /// </summary>
         string HttpMethod { get; }
 
         /// <summary>
-        /// The value of the Accept HTTP Request Header
+        /// Gets the value of the Accept HTTP Request Header.
         /// </summary>
         string Accept { get; }
     }
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
index b153f15ec3..abc581d8e2 100644
--- a/MediaBrowser.Model/Services/IHttpResult.cs
+++ b/MediaBrowser.Model/Services/IHttpResult.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System.Net;
@@ -7,27 +8,27 @@ namespace MediaBrowser.Model.Services
     public interface IHttpResult : IHasHeaders
     {
         /// <summary>
-        /// The HTTP Response Status
+        /// The HTTP Response Status.
         /// </summary>
         int Status { get; set; }
 
         /// <summary>
-        /// The HTTP Response Status Code
+        /// The HTTP Response Status Code.
         /// </summary>
         HttpStatusCode StatusCode { get; set; }
 
         /// <summary>
-        /// The HTTP Response ContentType
+        /// The HTTP Response ContentType.
         /// </summary>
         string ContentType { get; set; }
 
         /// <summary>
-        /// Response DTO
+        /// Response DTO.
         /// </summary>
         object Response { get; set; }
 
         /// <summary>
-        /// Holds the request call context
+        /// Holds the request call context.
         /// </summary>
         IRequest RequestContext { get; set; }
     }
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 3f4edced61..f413f1e177 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
index 19e9e53e76..d07ff15482 100644
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ b/MediaBrowser.Model/Services/QueryParamCollection.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -19,11 +20,6 @@ namespace MediaBrowser.Model.Services
             return StringComparison.OrdinalIgnoreCase;
         }
 
-        private static StringComparer GetStringComparer()
-        {
-            return StringComparer.OrdinalIgnoreCase;
-        }
-
         /// <summary>
         /// Adds a new query parameter.
         /// </summary>
diff --git a/MediaBrowser.Model/Services/RouteAttribute.cs b/MediaBrowser.Model/Services/RouteAttribute.cs
index 197ba05e58..162576aa7e 100644
--- a/MediaBrowser.Model/Services/RouteAttribute.cs
+++ b/MediaBrowser.Model/Services/RouteAttribute.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;