Merge branch 'master' into authenticationdb-efcore

# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs

MediaBrowser.Controller/Net/AuthorizationInfo.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Jellyfin.Data.Entities;
 

MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 #pragma warning disable CS1591
 
 using System;

MediaBrowser.Controller/Net/IAuthService.cs

@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.AspNetCore.Http;
 
 namespace MediaBrowser.Controller.Net

MediaBrowser.Controller/Net/IWebSocketConnection.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 #pragma warning disable CS1591
 
 #nullable enable
@@ -32,7 +34,7 @@ namespace MediaBrowser.Controller.Net
         DateTime LastKeepAliveDate { get; set; }
 
         /// <summary>
-        /// Gets or sets the query string.
+        /// Gets the query string.
         /// </summary>
         /// <value>The query string.</value>
         IQueryCollection QueryString { get; }

MediaBrowser.Controller/Net/SecurityException.cs

@@ -1,5 +1,3 @@
-#nullable enable
-
 using System;
 
 namespace MediaBrowser.Controller.Net

MediaBrowser.Controller/Net/WebSocketMessageInfo.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 using MediaBrowser.Model.Net;
 
 namespace MediaBrowser.Controller.Net