Merge branch 'master' into authenticationdb-efcore

# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs

1 files changed, 0 insertions, 64 deletions

diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
deleted file mode 100644
index 2cf0f0d5f..000000000
--- a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Model.Querying
-{
-    public class UpcomingEpisodesQuery
-    {
-        public UpcomingEpisodesQuery()
-        {
-            EnableImageTypes = Array.Empty<ImageType>();
-        }
-
-        /// <summary>
-        /// Gets or sets the user id.
-        /// </summary>
-        /// <value>The user id.</value>
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the parent identifier.
-        /// </summary>
-        /// <value>The parent identifier.</value>
-        public string ParentId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the start index. Use for paging.
-        /// </summary>
-        /// <value>The start index.</value>
-        public int? StartIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum number of items to return.
-        /// </summary>
-        /// <value>The limit.</value>
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Gets or sets the fields to return within the items, in addition to basic information.
-        /// </summary>
-        /// <value>The fields.</value>
-        public ItemFields[] Fields { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable images].
-        /// </summary>
-        /// <value><c>null</c> if [enable images] contains no value, <c>true</c> if [enable images]; otherwise, <c>false</c>.</value>
-        public bool? EnableImages { get; set; }
-
-        /// <summary>
-        /// Gets or sets the image type limit.
-        /// </summary>
-        /// <value>The image type limit.</value>
-        public int? ImageTypeLimit { get; set; }
-
-        /// <summary>
-        /// Gets or sets the enable image types.
-        /// </summary>
-        /// <value>The enable image types.</value>
-        public ImageType[] EnableImageTypes { get; set; }
-    }
-}