From 0984dd2a4a52e2d70cd132d061789c4a543d0b33 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 29 May 2017 15:51:05 -0400 Subject: update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 42 +++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) (limited to 'MediaBrowser.Server.Mac') diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 3d84a435f3..d6b1f8fafe 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -109,15 +109,6 @@ True - - ..\ThirdParty\emby\Emby.Common.Implementations.dll - - - ..\ThirdParty\emby\Emby.Server.Core.dll - - - ..\ThirdParty\emby\Mono.Nat.dll - ..\ThirdParty\taglib\TagLib.Portable.dll @@ -176,10 +167,6 @@ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2} MediaBrowser.Controller - - {B90AB8F2-1BFF-4568-A3FD-2A338A435A75} - MediaBrowser.Server.Startup.Common - {9142EEFA-7570-41E1-BFCC-468BB571AF2F} MediaBrowser.Common @@ -244,14 +231,26 @@ {88AE38DF-19D7-406F-A6A9-09527719A21E} BDInfo - - {4F26D5D8-A7B0-42B3-BA42-7CB7D245934E} - SocketHttpListener.Portable - {21002819-C39A-4D3E-BE83-2A276A77FB1F} RSSDP + + {1E37A338-9F57-4B70-BD6D-BB9C591E319B} + Emby.Common.Implementations + + + {1D74413B-E7CF-455B-B021-F52BDF881542} + SocketHttpListener + + + {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0} + Emby.Server.Core + + + {CB7F2326-6497-4A3D-BA03-48513B17A7BE} + Mono.Nat + @@ -979,6 +978,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\htmlaudioplayer\plugin.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\htmlvideoplayer\htmlmediahelper.js + Resources\dashboard-ui\bower_components\emby-webcomponents\htmlvideoplayer\plugin.js @@ -1105,6 +1107,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\pagejs\page.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\photoplayer\plugin.js + Resources\dashboard-ui\bower_components\emby-webcomponents\playback\autoplaydetect.js @@ -1135,6 +1140,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\playback\playersettingsmenu.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\playback\playqueuemanager.js + Resources\dashboard-ui\bower_components\emby-webcomponents\playback\remotecontrolautoplay.js -- cgit v1.2.3 From 4722f36b691af4a5552682d3cde4f6afd9bed680 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 29 May 2017 15:55:37 -0400 Subject: update mac project --- MediaBrowser.Server.Mac/Main.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'MediaBrowser.Server.Mac') diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 8a3a6cdbab..4862a988dd 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -1,6 +1,4 @@ using MediaBrowser.Model.Logging; -using MediaBrowser.Server.Startup.Common; -using MediaBrowser.Server.Startup.Common.IO; using MediaBrowser.Server.Implementations; using System; using System.Diagnostics; @@ -27,7 +25,7 @@ using Emby.Common.Implementations.EnvironmentInfo; using Emby.Server.Mac.Native; using Emby.Server.Implementations.IO; using Emby.Common.Implementations.Networking; -using Emby.Common.Implementations.Security; +using Emby.Common.Implementations.Cryptography; using Mono.Unix.Native; using MediaBrowser.Model.System; using MediaBrowser.Model.IO; -- cgit v1.2.3 From 23c280ec18bad783faa4bc294783281ccc4f23c3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 29 May 2017 15:58:22 -0400 Subject: update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Mac') diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 3d84a435f3..889b25f712 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -93,19 +93,19 @@ ..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll - ..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll + ..\packages\NLog.4.4.9\lib\net45\NLog.dll True - - ..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll + + ..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll True ..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll True - - ..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll + + ..\packages\SimpleInjector.4.0.7\lib\net45\SimpleInjector.dll True @@ -122,7 +122,7 @@ ..\ThirdParty\taglib\TagLib.Portable.dll - ..\packages\SkiaSharp.1.57.1\lib\net45\SkiaSharp.dll + ..\packages\SkiaSharp.1.58.0\lib\net45\SkiaSharp.dll ..\packages\SQLitePCLRaw.core.1.1.5\lib\net45\SQLitePCLRaw.core.dll @@ -2709,7 +2709,7 @@ - + Dynamic False -- cgit v1.2.3 From c7c3622d6174122ffe454aef834da8d2c4a18b05 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 29 May 2017 16:06:00 -0400 Subject: update packages --- MediaBrowser.Server.Mac/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Mac') diff --git a/MediaBrowser.Server.Mac/packages.config b/MediaBrowser.Server.Mac/packages.config index 98f56960b2..f6a11cd3a2 100644 --- a/MediaBrowser.Server.Mac/packages.config +++ b/MediaBrowser.Server.Mac/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file -- cgit v1.2.3 From 7ef861e19d2da2ae88291dde420c9d4808a5fda0 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 29 May 2017 16:07:05 -0400 Subject: update mac project --- MediaBrowser.Server.Mac/Main.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'MediaBrowser.Server.Mac') diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 4862a988dd..d84d696ddd 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -18,6 +18,8 @@ using MonoMac.AppKit; using MonoMac.Foundation; using MonoMac.ObjCRuntime; using Emby.Server.Core; +using Emby.Server.Core.Cryptography; +using Emby.Server.Core.IO; using Emby.Server.Implementations; using Emby.Common.Implementations.Logging; using Emby.Server.Implementations.Logging; -- cgit v1.2.3