From 7e3c45c917d707fcea048b2fe9621cf0774e3f98 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Thu, 31 Jan 2019 03:16:31 +0900
Subject: fix build errors and update plugin manifest location

---
 Emby.Server.Implementations/Updates/InstallationManager.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'Emby.Server.Implementations/Updates')

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 9a49b97c71..637c4d4f33 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -169,10 +169,8 @@ namespace Emby.Server.Implementations.Updates
             string packageType = null,
             Version applicationVersion = null)
         {
-            // TODO cvium: when plugins get back this would need to be fixed
-            // var packages = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
-
-            return Task.FromResult(new List<PackageInfo>()); //FilterPackages(packages, packageType, applicationVersion);
+            var packages = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
+            return FilterPackages(packages, packageType, applicationVersion);
         }
 
         /// <summary>
@@ -184,12 +182,10 @@ namespace Emby.Server.Implementations.Updates
         {
             using (var response = await _httpClient.SendAsync(new HttpRequestOptions
             {
-                Url = "https://www.mb3admin.local/admin/service/EmbyPackages.json",
+                Url = "https://repo.jellyfin.org/releases/plugin/manifest.json",
                 CancellationToken = cancellationToken,
                 Progress = new SimpleProgress<double>(),
-                CacheLength = GetCacheLength(),
-                CacheMode = CacheMode.Unconditional
-
+                CacheLength = GetCacheLength()
             }, "GET").ConfigureAwait(false))
             {
                 using (var stream = response.Content)
-- 
cgit v1.2.3


From cb1ff695852348e217b9fb065d94769bb9104953 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Sun, 3 Feb 2019 21:57:49 +0100
Subject: Fix build error

---
 Emby.Server.Implementations/Updates/InstallationManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations/Updates')

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 637c4d4f33..dc7f57f27d 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -164,7 +164,7 @@ namespace Emby.Server.Implementations.Updates
         /// Gets all available packages.
         /// </summary>
         /// <returns>Task{List{PackageInfo}}.</returns>
-        public Task<List<PackageInfo>> GetAvailablePackages(CancellationToken cancellationToken,
+        public async Task<List<PackageInfo>> GetAvailablePackages(CancellationToken cancellationToken,
             bool withRegistration = true,
             string packageType = null,
             Version applicationVersion = null)
-- 
cgit v1.2.3