From a2190765c8e00ebc5de5adcac62bd7b823d9f50b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 22 Jul 2013 10:58:38 -0400 Subject: [PATCH] update to servicestack 3.9.56 --- MediaBrowser.Api/MediaBrowser.Api.csproj | 8 ++++---- MediaBrowser.Api/SimilarItemsHelper.cs | 12 ++++++++++- MediaBrowser.Api/TvShowsService.cs | 12 ++++++++++- .../UserLibrary/BaseItemsRequest.cs | 12 ++++++++++- MediaBrowser.Api/packages.config | 2 +- .../MediaBrowser.Common.csproj | 8 ++++---- MediaBrowser.Common/packages.config | 2 +- ...MediaBrowser.Server.Implementations.csproj | 20 +++++++++---------- .../packages.config | 6 +++--- .../MediaBrowser.ServerApplication.csproj | 16 +++++++-------- .../packages.config | 4 ++-- .../MediaBrowser.WebDashboard.csproj | 8 ++++---- MediaBrowser.WebDashboard/packages.config | 2 +- 13 files changed, 71 insertions(+), 41 deletions(-) diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 16cc5b1c68..b0919a936b 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -39,13 +39,13 @@ ..\packages\morelinq.1.0.15631-beta\lib\net35\MoreLinq.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Interfaces.dll False diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs index 0dc1634494..cbe34b0940 100644 --- a/MediaBrowser.Api/SimilarItemsHelper.cs +++ b/MediaBrowser.Api/SimilarItemsHelper.cs @@ -58,7 +58,17 @@ namespace MediaBrowser.Api return new ItemFields[] { }; } - return val.Split(',').Select(v => (ItemFields)Enum.Parse(typeof(ItemFields), v, true)); + return val.Split(',').Select(v => + { + ItemFields value; + + if (Enum.TryParse(v, true, out value)) + { + return (ItemFields?)value; + } + return null; + + }).Where(i => i.HasValue).Select(i => i.Value); } } diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs index 3f3259171e..2b600e1289 100644 --- a/MediaBrowser.Api/TvShowsService.cs +++ b/MediaBrowser.Api/TvShowsService.cs @@ -61,7 +61,17 @@ namespace MediaBrowser.Api return new ItemFields[] { }; } - return val.Split(',').Select(v => (ItemFields)Enum.Parse(typeof(ItemFields), v, true)); + return val.Split(',').Select(v => + { + ItemFields value; + + if (Enum.TryParse(v, true, out value)) + { + return (ItemFields?)value; + } + return null; + + }).Where(i => i.HasValue).Select(i => i.Value); } } diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs index 2e3b84e8d7..04083667dd 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs @@ -108,7 +108,17 @@ namespace MediaBrowser.Api.UserLibrary return new ItemFields[] { }; } - return val.Split(',').Select(v => (ItemFields)Enum.Parse(typeof(ItemFields), v, true)); + return val.Split(',').Select(v => + { + ItemFields value; + + if (Enum.TryParse(v, true, out value)) + { + return (ItemFields?)value; + } + return null; + + }).Where(i => i.HasValue).Select(i => i.Value); } } } diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config index c9ff48a860..9b3aa02455 100644 --- a/MediaBrowser.Api/packages.config +++ b/MediaBrowser.Api/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 64479d0f1d..32f5d0c6d5 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -37,13 +37,13 @@ - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Interfaces.dll False diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config index 8d406f6cca..bbbeb74970 100644 --- a/MediaBrowser.Common/packages.config +++ b/MediaBrowser.Common/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 406830037a..e58369df14 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -48,21 +48,21 @@ ..\packages\morelinq.1.0.15631-beta\lib\net35\MoreLinq.dll - + False - ..\packages\ServiceStack.3.9.55\lib\net35\ServiceStack.dll + ..\packages\ServiceStack.3.9.56\lib\net35\ServiceStack.dll - + False - ..\packages\ServiceStack.Api.Swagger.3.9.55\lib\net35\ServiceStack.Api.Swagger.dll + ..\packages\ServiceStack.Api.Swagger.3.9.56\lib\net35\ServiceStack.Api.Swagger.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Interfaces.dll False @@ -72,9 +72,9 @@ False ..\packages\ServiceStack.Redis.3.9.43\lib\net35\ServiceStack.Redis.dll - + False - ..\packages\ServiceStack.3.9.55\lib\net35\ServiceStack.ServiceInterface.dll + ..\packages\ServiceStack.3.9.56\lib\net35\ServiceStack.ServiceInterface.dll False diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index d7bfb4c313..974c4c9bc3 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -7,9 +7,9 @@ - - - + + + diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index db05839082..4ca3480b4c 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -140,17 +140,17 @@ ..\packages\MediaBrowser.IsoMounting.3.0.55\lib\net45\pfmclrapi.dll - + False - ..\packages\ServiceStack.3.9.55\lib\net35\ServiceStack.dll + ..\packages\ServiceStack.3.9.56\lib\net35\ServiceStack.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Interfaces.dll ..\packages\ServiceStack.OrmLite.SqlServer.3.9.44\lib\ServiceStack.OrmLite.SqlServer.dll @@ -158,9 +158,9 @@ ..\packages\ServiceStack.Redis.3.9.44\lib\net35\ServiceStack.Redis.dll - + False - ..\packages\ServiceStack.3.9.55\lib\net35\ServiceStack.ServiceInterface.dll + ..\packages\ServiceStack.3.9.56\lib\net35\ServiceStack.ServiceInterface.dll False diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 951fbdeff3..beb60007bd 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index bd8ea60b03..e38d470d59 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -35,13 +35,13 @@ Always - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.55\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.56\lib\net35\ServiceStack.Interfaces.dll False diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index 2fb9059994..ab301bbe11 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file