From d13d75141c375a0e2d2b4259269ca94263769f41 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 2 Oct 2017 00:45:38 -0400 Subject: [PATCH 1/3] update mac project --- .../Emby.Server.Mac.csproj | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 483033f10..19239c79b 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -435,9 +435,6 @@ Resources\dashboard-ui\plugins.html - - Resources\dashboard-ui\reports.html - Resources\dashboard-ui\robots.txt @@ -675,9 +672,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\chromecastplayer.js - Resources\dashboard-ui\bower_components\emby-webcomponents\clearbutton.css @@ -828,6 +822,12 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\roundcard.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\chromecast\chromecasthelpers.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\chromecast\chromecastplayer.js + Resources\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js @@ -1038,6 +1038,15 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\images\style.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\imageuploader\imageuploader.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\imageuploader\imageuploader.template.html + + + Resources\dashboard-ui\bower_components\emby-webcomponents\imageuploader\style.css + Resources\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css @@ -1197,6 +1206,12 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\playbacksettings\playbacksettings.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\playbacksettings\playbacksettings.template.html + Resources\dashboard-ui\bower_components\emby-webcomponents\playerstats\playerstats.css @@ -1524,6 +1539,15 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark-red\theme.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\bg.jpg + + + Resources\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\logo.png + + + Resources\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\theme.css + Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light\logo.png @@ -1740,9 +1764,6 @@ Resources\dashboard-ui\components\categorysyncbuttons.js - - Resources\dashboard-ui\components\chromecasthelpers.js - Resources\dashboard-ui\components\favoriteitems.js @@ -1809,12 +1830,6 @@ Resources\dashboard-ui\components\guestinviter\guestinviter.template.html - - Resources\dashboard-ui\components\imageuploader\imageuploader.js - - - Resources\dashboard-ui\components\imageuploader\imageuploader.template.html - Resources\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js @@ -2625,12 +2640,6 @@ Resources\dashboard-ui\strings\zh-tw.json - - Resources\dashboard-ui\themes\halloween\bg.jpg - - - Resources\dashboard-ui\themes\halloween\style.css - Resources\dashboard-ui\themes\halloween\theme.js From 3ace9e672fb2543058bcbd8fef12783585c38204 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 2 Oct 2017 00:49:45 -0400 Subject: [PATCH 2/3] update mac project --- MediaBrowser.Server.Mac/MacAppHost.cs | 1 - MediaBrowser.Server.Mac/Main.cs | 2 -- 2 files changed, 3 deletions(-) diff --git a/MediaBrowser.Server.Mac/MacAppHost.cs b/MediaBrowser.Server.Mac/MacAppHost.cs index 44dec83d2..ddcc33778 100644 --- a/MediaBrowser.Server.Mac/MacAppHost.cs +++ b/MediaBrowser.Server.Mac/MacAppHost.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using Emby.Server.Core; using Emby.Server.Implementations; using Emby.Server.Implementations.FFMpeg; using MediaBrowser.Model.IO; diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 6af58e66c..0b34822eb 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -16,8 +16,6 @@ using System.Threading; using MonoMac.AppKit; using MonoMac.Foundation; using MonoMac.ObjCRuntime; -using Emby.Server.Core; -using Emby.Server.Core.Cryptography; using Emby.Server.Implementations; using Emby.Server.Implementations.Logging; using Emby.Server.Mac.Native; From 4c34534db61d56fc81b1e11c3f281e914850b647 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 2 Oct 2017 00:51:59 -0400 Subject: [PATCH 3/3] update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 19239c79b..d1078731f 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -96,8 +96,8 @@ ..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll True - - ..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll + + ..\packages\SharpCompress.0.18.2\lib\net45\SharpCompress.dll True @@ -109,7 +109,7 @@ ..\ThirdParty\taglib\TagLib.Portable.dll - ..\packages\SkiaSharp.1.58.0\lib\net45\SkiaSharp.dll + ..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll ..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll @@ -2681,7 +2681,7 @@ - + Dynamic False