Merge branch 'master' into feature/ffmpeg-version-check

4 files changed, 22 insertions, 32 deletions

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 4eed79c4c..146ebaf25 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -1,7 +1,6 @@
 #pragma warning disable CS1591
 
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -17,12 +16,10 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Model.Events;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Updates;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Updates
@@ -49,7 +46,6 @@ namespace Emby.Server.Implementations.Updates
         private readonly IApplicationHost _applicationHost;
 
         private readonly IZipClient _zipClient;
-        private readonly IConfiguration _appConfig;
 
         private readonly object _currentInstallationsLock = new object();
 
@@ -71,8 +67,7 @@ namespace Emby.Server.Implementations.Updates
             IJsonSerializer jsonSerializer,
             IServerConfigurationManager config,
             IFileSystem fileSystem,
-            IZipClient zipClient,
-            IConfiguration appConfig)
+            IZipClient zipClient)
         {
             if (logger == null)
             {
@@ -90,7 +85,6 @@ namespace Emby.Server.Implementations.Updates
             _config = config;
             _fileSystem = fileSystem;
             _zipClient = zipClient;
-            _appConfig = appConfig;
         }
 
         /// <inheritdoc />
@@ -118,7 +112,7 @@ namespace Emby.Server.Implementations.Updates
         public IEnumerable<InstallationInfo> CompletedInstallations => _completedInstallationsInternal;
 
         /// <inheritdoc />
-        public async Task<IEnumerable<PackageInfo>> GetPackages(string manifest, CancellationToken cancellationToken = default)
+        public async Task<IReadOnlyList<PackageInfo>> GetPackages(string manifest, CancellationToken cancellationToken = default)
         {
             try
             {
@@ -140,19 +134,19 @@ namespace Emby.Server.Implementations.Updates
                     catch (SerializationException ex)
                     {
                         _logger.LogError(ex, "Failed to deserialize the plugin manifest retrieved from {Manifest}", manifest);
-                        return Enumerable.Empty<PackageInfo>();
+                        return Array.Empty<PackageInfo>();
                     }
                 }
             }
             catch (UriFormatException ex)
             {
                 _logger.LogError(ex, "The URL configured for the plugin repository manifest URL is not valid: {Manifest}", manifest);
-                return Enumerable.Empty<PackageInfo>();
+                return Array.Empty<PackageInfo>();
             }
             catch (HttpException ex)
             {
                 _logger.LogError(ex, "An error occurred while accessing the plugin manifest: {Manifest}", manifest);
-                return Enumerable.Empty<PackageInfo>();
+                return Array.Empty<PackageInfo>();
             }
         }
 
@@ -165,7 +159,7 @@ namespace Emby.Server.Implementations.Updates
                 result.AddRange(await GetPackages(repository.Url, cancellationToken).ConfigureAwait(true));
             }
 
-            return result.AsReadOnly();
+            return result;
         }
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs
index a5025aee9..4b4030bc2 100644
--- a/MediaBrowser.Common/Updates/IInstallationManager.cs
+++ b/MediaBrowser.Common/Updates/IInstallationManager.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Plugins;
-using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Updates;
 
 namespace MediaBrowser.Common.Updates
@@ -46,7 +45,7 @@ namespace MediaBrowser.Common.Updates
         /// <param name="manifest">The URL to query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{IReadOnlyList{PackageInfo}}.</returns>
-        Task<IEnumerable<PackageInfo>> GetPackages(string manifest, CancellationToken cancellationToken = default);
+        Task<IReadOnlyList<PackageInfo>> GetPackages(string manifest, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets all available packages.
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 54f4fb293..66f3e1a94 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -12,7 +12,15 @@ namespace MediaBrowser.Model.Configuration
     public class BaseApplicationConfiguration
     {
         /// <summary>
-        /// The number of days we should retain log files.
+        /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
+        /// </summary>
+        public BaseApplicationConfiguration()
+        {
+            LogFileRetentionDays = 3;
+        }
+
+        /// <summary>
+        /// Gets or sets the number of days we should retain log files.
         /// </summary>
         /// <value>The log file retention days.</value>
         public int LogFileRetentionDays { get; set; }
@@ -30,29 +38,21 @@ namespace MediaBrowser.Model.Configuration
         public string CachePath { get; set; }
 
         /// <summary>
-        /// Last known version that was ran using the configuration.
+        /// Gets or sets the last known version that was ran using the configuration.
         /// </summary>
         /// <value>The version from previous run.</value>
         [XmlIgnore]
         public Version PreviousVersion { get; set; }
 
         /// <summary>
-        /// Stringified PreviousVersion to be stored/loaded,
-        /// because System.Version itself isn't xml-serializable
+        /// Gets or sets the stringified PreviousVersion to be stored/loaded,
+        /// because System.Version itself isn't xml-serializable.
         /// </summary>
-        /// <value>String value of PreviousVersion</value>
+        /// <value>String value of PreviousVersion.</value>
         public string PreviousVersionStr
         {
             get => PreviousVersion?.ToString();
             set => PreviousVersion = Version.Parse(value);
         }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
-        /// </summary>
-        public BaseApplicationConfiguration()
-        {
-            LogFileRetentionDays = 3;
-        }
     }
 }
diff --git a/MediaBrowser.Model/Updates/RepositoryInfo.cs b/MediaBrowser.Model/Updates/RepositoryInfo.cs
index 905327c36..bd42e77f0 100644
--- a/MediaBrowser.Model/Updates/RepositoryInfo.cs
+++ b/MediaBrowser.Model/Updates/RepositoryInfo.cs
@@ -1,6 +1,3 @@
-#nullable disable
-using System;
-
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
@@ -12,12 +9,12 @@ namespace MediaBrowser.Model.Updates
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the URL.
         /// </summary>
         /// <value>The URL.</value>
-        public string Url { get; set; }
+        public string? Url { get; set; }
     }
 }