From 35c2590a27503b09edd0df07a7849134cf11d5c0 Mon Sep 17 00:00:00 2001 From: crobibero Date: Thu, 3 Dec 2020 08:06:06 -0700 Subject: [PATCH 1/2] Target 10.7 --- Jellyfin.Plugin.ServerWMC/Jellyfin.Plugin.ServerWMC.csproj | 6 +++--- Jellyfin.Plugin.ServerWMC/WMCService.cs | 3 ++- build.yaml | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Jellyfin.Plugin.ServerWMC/Jellyfin.Plugin.ServerWMC.csproj b/Jellyfin.Plugin.ServerWMC/Jellyfin.Plugin.ServerWMC.csproj index b440ce3..34a985e 100644 --- a/Jellyfin.Plugin.ServerWMC/Jellyfin.Plugin.ServerWMC.csproj +++ b/Jellyfin.Plugin.ServerWMC/Jellyfin.Plugin.ServerWMC.csproj @@ -1,10 +1,10 @@ - netstandard2.1 + net5.0 Jellyfin.Plugin.ServerWMC - 5.0.0.0 - 5.0.0.0 + 6.0.0.0 + 6.0.0.0 diff --git a/Jellyfin.Plugin.ServerWMC/WMCService.cs b/Jellyfin.Plugin.ServerWMC/WMCService.cs index 09d45ce..6b9f2e3 100644 --- a/Jellyfin.Plugin.ServerWMC/WMCService.cs +++ b/Jellyfin.Plugin.ServerWMC/WMCService.cs @@ -16,6 +16,7 @@ using MediaBrowser.Controller.Drawing; using MediaBrowser.Model.Dto; using System.Net; +using System.Net.Http; using System.Xml.Linq; using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.IO; @@ -62,7 +63,7 @@ public class WMCService : ILiveTvService, IDisposable /// /// constructor /// - public WMCService(IHttpClient httpClient, IFileSystem fileSystem, ILoggerFactory loggerFactory) + public WMCService(IFileSystem fileSystem, ILoggerFactory loggerFactory) { Instance = this; _logger = loggerFactory.CreateLogger(); // start logger diff --git a/build.yaml b/build.yaml index b970cfc..a335e94 100644 --- a/build.yaml +++ b/build.yaml @@ -1,8 +1,9 @@ --- name: "ServerWMC" guid: "1fc322a1-af2e-49a5-b2eb-a89b4240f700" -version: "5.0.0.0" -targetAbi: "10.6.0.0" +version: "6.0.0.0" +targetAbi: "10.7.0.0" +framework: "net5.0" overview: "Jellyfin Live TV plugin for Windows MediaCenter with ServerWMC" description: > Provides access to Live TV, Program Guide and Recordings from your Windows MediaCenter Server running ServerWMC. From bf0645d9cb2145cc6fdeefabc12ce33bfc5d3529 Mon Sep 17 00:00:00 2001 From: crobibero Date: Thu, 3 Dec 2020 12:32:51 -0700 Subject: [PATCH 2/2] Remove unused using directives. --- Jellyfin.Plugin.ServerWMC/Plugin.cs | 3 --- Jellyfin.Plugin.ServerWMC/RecordingsChannel.cs | 1 - Jellyfin.Plugin.ServerWMC/SocketClient.cs | 1 - Jellyfin.Plugin.ServerWMC/SocketClientAsync.cs | 1 - Jellyfin.Plugin.ServerWMC/WMCService.cs | 5 ----- 5 files changed, 11 deletions(-) diff --git a/Jellyfin.Plugin.ServerWMC/Plugin.cs b/Jellyfin.Plugin.ServerWMC/Plugin.cs index 3055a69..ff252df 100644 --- a/Jellyfin.Plugin.ServerWMC/Plugin.cs +++ b/Jellyfin.Plugin.ServerWMC/Plugin.cs @@ -5,9 +5,6 @@ using MediaBrowser.Common.Plugins; using MediaBrowser.Model.Plugins; using MediaBrowser.Model.Serialization; -using Microsoft.Extensions.Logging; -using System.IO; -using MediaBrowser.Model.Drawing; namespace Jellyfin.Plugin.ServerWMC { diff --git a/Jellyfin.Plugin.ServerWMC/RecordingsChannel.cs b/Jellyfin.Plugin.ServerWMC/RecordingsChannel.cs index f231e31..19885f8 100644 --- a/Jellyfin.Plugin.ServerWMC/RecordingsChannel.cs +++ b/Jellyfin.Plugin.ServerWMC/RecordingsChannel.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; using System.Threading; using System.Threading.Tasks; using MediaBrowser.Controller.Channels; diff --git a/Jellyfin.Plugin.ServerWMC/SocketClient.cs b/Jellyfin.Plugin.ServerWMC/SocketClient.cs index 28202a3..58eca48 100644 --- a/Jellyfin.Plugin.ServerWMC/SocketClient.cs +++ b/Jellyfin.Plugin.ServerWMC/SocketClient.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Net; using System.Net.Sockets; diff --git a/Jellyfin.Plugin.ServerWMC/SocketClientAsync.cs b/Jellyfin.Plugin.ServerWMC/SocketClientAsync.cs index 4fe69c9..83d84b7 100644 --- a/Jellyfin.Plugin.ServerWMC/SocketClientAsync.cs +++ b/Jellyfin.Plugin.ServerWMC/SocketClientAsync.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Net; using System.Net.Sockets; diff --git a/Jellyfin.Plugin.ServerWMC/WMCService.cs b/Jellyfin.Plugin.ServerWMC/WMCService.cs index 6b9f2e3..f5aeb0b 100644 --- a/Jellyfin.Plugin.ServerWMC/WMCService.cs +++ b/Jellyfin.Plugin.ServerWMC/WMCService.cs @@ -4,19 +4,14 @@ using System.Text; using System.Threading.Tasks; using System.IO; -using MediaBrowser.Common.Net; using MediaBrowser.Controller.LiveTv; using MediaBrowser.Model.LiveTv; using System.Threading; using System.Reflection; -using System.Diagnostics; using Microsoft.Extensions.Logging; using MediaBrowser.Model.Entities; -using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Drawing; using MediaBrowser.Model.Dto; -using System.Net; -using System.Net.Http; using System.Xml.Linq; using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.IO;