Update to 3.5.2 and .net core 2.1

1 files changed, 12 insertions, 11 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
index 9f887ba03..691112638 100644
--- a/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
@@ -16,7 +16,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
     /// <summary>
     /// Plugin Update Task
     /// </summary>
-    public class PluginUpdateTask : IScheduledTask
+    public class PluginUpdateTask : IScheduledTask, IConfigurableScheduledTask
     {
         /// <summary>
         /// The _logger
@@ -71,14 +71,13 @@ namespace Emby.Server.Implementations.ScheduledTasks
 
             var numComplete = 0;
 
-            // Create tasks for each one
-            var tasks = packagesToInstall.Select(i => Task.Run(async () =>
+            foreach (var package in packagesToInstall)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
                 try
                 {
-                    await _installationManager.InstallPackage(i, true, new SimpleProgress<double>(), cancellationToken).ConfigureAwait(false);
+                    await _installationManager.InstallPackage(package, true, new SimpleProgress<double>(), cancellationToken).ConfigureAwait(false);
                 }
                 catch (OperationCanceledException)
                 {
@@ -90,11 +89,11 @@ namespace Emby.Server.Implementations.ScheduledTasks
                 }
                 catch (HttpException ex)
                 {
-                    _logger.ErrorException("Error downloading {0}", ex, i.name);
+                    _logger.ErrorException("Error downloading {0}", ex, package.name);
                 }
                 catch (IOException ex)
                 {
-                    _logger.ErrorException("Error updating {0}", ex, i.name);
+                    _logger.ErrorException("Error updating {0}", ex, package.name);
                 }
 
                 // Update progress
@@ -106,11 +105,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
 
                     progress.Report(90 * percent + 10);
                 }
-            }));
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
+            }
 
             progress.Report(100);
         }
@@ -137,5 +132,11 @@ namespace Emby.Server.Implementations.ScheduledTasks
         {
             get { return "Application"; }
         }
+
+        public bool IsHidden => true;
+
+        public bool IsEnabled => true;
+
+        public bool IsLogged => true;
     }
 }
\ No newline at end of file