diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj index 413be33da..7a7fabf4f 100644 --- a/src/LogentriesNLog/LogentriesNLog.csproj +++ b/src/LogentriesNLog/LogentriesNLog.csproj @@ -8,7 +8,7 @@ false - + diff --git a/src/NzbDrone.Api/Sonarr.Api.csproj b/src/NzbDrone.Api/Sonarr.Api.csproj index c60916e61..38a2dc87a 100644 --- a/src/NzbDrone.Api/Sonarr.Api.csproj +++ b/src/NzbDrone.Api/Sonarr.Api.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/NzbDrone.Common/Serializer/Json.cs b/src/NzbDrone.Common/Serializer/Json.cs index 90023e8f3..fe05b01a4 100644 --- a/src/NzbDrone.Common/Serializer/Json.cs +++ b/src/NzbDrone.Common/Serializer/Json.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Common.Serializer ContractResolver = new CamelCasePropertyNamesContractResolver() }; - serializerSettings.Converters.Add(new StringEnumConverter { CamelCaseText = true }); + serializerSettings.Converters.Add(new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() }); serializerSettings.Converters.Add(new VersionConverter()); serializerSettings.Converters.Add(new HttpUriConverter()); diff --git a/src/NzbDrone.Common/Sonarr.Common.csproj b/src/NzbDrone.Common/Sonarr.Common.csproj index 9efeb9ae4..9e9383947 100644 --- a/src/NzbDrone.Common/Sonarr.Common.csproj +++ b/src/NzbDrone.Common/Sonarr.Common.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs index d5321d794..d2b9146f2 100644 --- a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs +++ b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Core.Datastore.Converters ContractResolver = new CamelCasePropertyNamesContractResolver() }; - SerializerSetting.Converters.Add(new StringEnumConverter { CamelCaseText = true }); + SerializerSetting.Converters.Add(new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() }); SerializerSetting.Converters.Add(new VersionConverter()); foreach (var converter in converters) diff --git a/src/NzbDrone.Core/Sonarr.Core.csproj b/src/NzbDrone.Core/Sonarr.Core.csproj index 8837b1172..f8e928ac4 100644 --- a/src/NzbDrone.Core/Sonarr.Core.csproj +++ b/src/NzbDrone.Core/Sonarr.Core.csproj @@ -7,11 +7,11 @@ - - + + - + diff --git a/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs index e222e046e..2aa43dc08 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Integration.Test.ApiTests body.Add("publishDate", DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ssZ", CultureInfo.InvariantCulture)); var request = ReleasePush.BuildRequest(); - request.AddBody(body); + request.AddJsonBody(body); var result = ReleasePush.Post(request, HttpStatusCode.OK); result.Should().NotBeNull(); diff --git a/src/NzbDrone.Integration.Test/Client/ClientBase.cs b/src/NzbDrone.Integration.Test/Client/ClientBase.cs index d0bd55bde..ca7dd71b7 100644 --- a/src/NzbDrone.Integration.Test/Client/ClientBase.cs +++ b/src/NzbDrone.Integration.Test/Client/ClientBase.cs @@ -104,14 +104,14 @@ namespace NzbDrone.Integration.Test.Client public TResource Post(TResource body, HttpStatusCode statusCode = HttpStatusCode.Created) { var request = BuildRequest(); - request.AddBody(body); + request.AddJsonBody(body); return Post(request, statusCode); } public TResource Put(TResource body, HttpStatusCode statusCode = HttpStatusCode.Accepted) { var request = BuildRequest(); - request.AddBody(body); + request.AddJsonBody(body); return Put(request, statusCode); } @@ -142,14 +142,14 @@ namespace NzbDrone.Integration.Test.Client public object InvalidPost(TResource body, HttpStatusCode statusCode = HttpStatusCode.BadRequest) { var request = BuildRequest(); - request.AddBody(body); + request.AddJsonBody(body); return Post(request, statusCode); } public object InvalidPut(TResource body, HttpStatusCode statusCode = HttpStatusCode.BadRequest) { var request = BuildRequest(); - request.AddBody(body); + request.AddJsonBody(body); return Put(request, statusCode); } diff --git a/src/NzbDrone.Integration.Test/Client/SeriesClient.cs b/src/NzbDrone.Integration.Test/Client/SeriesClient.cs index 01ec8bfc7..342fca2ec 100644 --- a/src/NzbDrone.Integration.Test/Client/SeriesClient.cs +++ b/src/NzbDrone.Integration.Test/Client/SeriesClient.cs @@ -14,15 +14,15 @@ namespace NzbDrone.Integration.Test.Client public List Lookup(string term) { - var request = BuildRequest("lookup?term={term}"); - request.AddUrlSegment("term", term); + var request = BuildRequest("lookup"); + request.AddQueryParameter("term", term); return Get>(request); } public List Editor(List series) { var request = BuildRequest("editor"); - request.AddBody(series); + request.AddJsonBody(series); return Put>(request); } diff --git a/src/NzbDrone.Mono/Sonarr.Mono.csproj b/src/NzbDrone.Mono/Sonarr.Mono.csproj index 81739ad2d..bcf8e61a4 100644 --- a/src/NzbDrone.Mono/Sonarr.Mono.csproj +++ b/src/NzbDrone.Mono/Sonarr.Mono.csproj @@ -4,7 +4,7 @@ x86 - + diff --git a/src/NzbDrone.SignalR/Sonarr.SignalR.csproj b/src/NzbDrone.SignalR/Sonarr.SignalR.csproj index 2df9cd9ee..b9f445267 100644 --- a/src/NzbDrone.SignalR/Sonarr.SignalR.csproj +++ b/src/NzbDrone.SignalR/Sonarr.SignalR.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj index 616f6d90c..42382464c 100644 --- a/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/src/NzbDrone.Update/Sonarr.Update.csproj b/src/NzbDrone.Update/Sonarr.Update.csproj index ccd6d7c7b..cdad43fa1 100644 --- a/src/NzbDrone.Update/Sonarr.Update.csproj +++ b/src/NzbDrone.Update/Sonarr.Update.csproj @@ -5,7 +5,7 @@ x86 - + diff --git a/src/NzbDrone.Windows/Sonarr.Windows.csproj b/src/NzbDrone.Windows/Sonarr.Windows.csproj index d3ae88b68..ab63ea668 100644 --- a/src/NzbDrone.Windows/Sonarr.Windows.csproj +++ b/src/NzbDrone.Windows/Sonarr.Windows.csproj @@ -4,7 +4,7 @@ x86 - + diff --git a/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj b/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj index e4a1206ec..b91afa187 100644 --- a/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj +++ b/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Sonarr.Http/Sonarr.Http.csproj b/src/Sonarr.Http/Sonarr.Http.csproj index b03f142c3..da536ac14 100644 --- a/src/Sonarr.Http/Sonarr.Http.csproj +++ b/src/Sonarr.Http/Sonarr.Http.csproj @@ -8,8 +8,8 @@ - - + +