diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index b1bab8cdd2..b8769cd239 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;
}
///
@@ -118,7 +112,7 @@ namespace Emby.Server.Implementations.Updates
public IEnumerable CompletedInstallations => _completedInstallationsInternal;
///
- public async Task> GetPackages(string manifest, CancellationToken cancellationToken = default)
+ public async Task> 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();
+ return Array.Empty();
}
}
}
catch (UriFormatException ex)
{
_logger.LogError(ex, "The URL configured for the plugin repository manifest URL is not valid: {Manifest}", manifest);
- return Enumerable.Empty();
+ return Array.Empty();
}
catch (HttpException ex)
{
_logger.LogError(ex, "An error occurred while accessing the plugin manifest: {Manifest}", manifest);
- return Enumerable.Empty();
+ return Array.Empty();
}
}
@@ -165,7 +159,7 @@ namespace Emby.Server.Implementations.Updates
result.AddRange(await GetPackages(repository.Url, cancellationToken).ConfigureAwait(true));
}
- return result.AsReadOnly();
+ return result;
}
///
diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs
index a5025aee96..4b4030bc27 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
/// The URL to query.
/// The cancellation token.
/// Task{IReadOnlyList{PackageInfo}}.
- Task> GetPackages(string manifest, CancellationToken cancellationToken = default);
+ Task> GetPackages(string manifest, CancellationToken cancellationToken = default);
///
/// Gets all available packages.
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 54f4fb293c..66f3e1a94b 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -12,7 +12,15 @@ namespace MediaBrowser.Model.Configuration
public class BaseApplicationConfiguration
{
///
- /// The number of days we should retain log files.
+ /// Initializes a new instance of the class.
+ ///
+ public BaseApplicationConfiguration()
+ {
+ LogFileRetentionDays = 3;
+ }
+
+ ///
+ /// Gets or sets the number of days we should retain log files.
///
/// The log file retention days.
public int LogFileRetentionDays { get; set; }
@@ -30,29 +38,21 @@ namespace MediaBrowser.Model.Configuration
public string CachePath { get; set; }
///
- /// Last known version that was ran using the configuration.
+ /// Gets or sets the last known version that was ran using the configuration.
///
/// The version from previous run.
[XmlIgnore]
public Version PreviousVersion { get; set; }
///
- /// 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.
///
- /// String value of PreviousVersion
+ /// String value of PreviousVersion.
public string PreviousVersionStr
{
get => PreviousVersion?.ToString();
set => PreviousVersion = Version.Parse(value);
}
-
- ///
- /// Initializes a new instance of the class.
- ///
- public BaseApplicationConfiguration()
- {
- LogFileRetentionDays = 3;
- }
}
}
diff --git a/MediaBrowser.Model/Updates/RepositoryInfo.cs b/MediaBrowser.Model/Updates/RepositoryInfo.cs
index 905327c368..bd42e77f0f 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
{
///
@@ -12,12 +9,12 @@ namespace MediaBrowser.Model.Updates
/// Gets or sets the name.
///
/// The name.
- public string Name { get; set; }
+ public string? Name { get; set; }
///
/// Gets or sets the URL.
///
/// The URL.
- public string Url { get; set; }
+ public string? Url { get; set; }
}
}