mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated NLog to 4.6.6, Newtonsoft.Json to 12.0.2, RestSharp to 106.6.10

This commit is contained in:
Taloth Saldono 2019-08-16 21:03:45 +02:00
parent 896e824ca1
commit 2b7893c834
16 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LogentriesNLog/LogentriesNLog.csproj
View File

@ -8,7 +8,7 @@
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="NLog" Version="4.6.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LogentriesCore\LogentriesCore.csproj" />

2
src/NzbDrone.Api/Sonarr.Api.csproj
View File

@ -9,7 +9,7 @@
<PackageReference Include="Nancy" Version="1.4.4" />
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
<PackageReference Include="Nancy.Authentication.Forms" Version="1.4.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />

2
src/NzbDrone.Common/Serializer/Json.cs
View File

@ -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());

4
src/NzbDrone.Common/Sonarr.Common.csproj
View File

@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DotNet4.SocksProxy" Version="1.3.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NLog" Version="4.6.6" />
<PackageReference Include="SharpRaven" Version="2.4.0" />
<PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />

2
src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs
View File

@ -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)

6
src/NzbDrone.Core/Sonarr.Core.csproj
View File

@ -7,11 +7,11 @@
<PackageReference Include="FluentMigrator.Runner" Version="1.6.2" />
<PackageReference Include="FluentValidation" Version="8.4.0" />
<PackageReference Include="ImageResizer" Version="3.4.3" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NLog" Version="4.6.6" />
<PackageReference Include="OAuth" Version="1.0.3" />
<PackageReference Include="Prowlin" Version="0.9.4456.26422" />
<PackageReference Include="RestSharp" Version="105.2.3" />
<PackageReference Include="RestSharp" Version="106.6.10" />
<PackageReference Include="TinyTwitter" Version="1.1.2" />
<PackageReference Include="xmlrpcnet" Version="2.5.0" />
</ItemGroup>

2
src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs
View File

@ -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<ReleaseResource>(request, HttpStatusCode.OK);
result.Should().NotBeNull();

8
src/NzbDrone.Integration.Test/Client/ClientBase.cs
View File

@ -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<TResource>(request, statusCode);
}
public TResource Put(TResource body, HttpStatusCode statusCode = HttpStatusCode.Accepted)
{
var request = BuildRequest();
request.AddBody(body);
request.AddJsonBody(body);
return Put<TResource>(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<object>(request, statusCode);
}
public object InvalidPut(TResource body, HttpStatusCode statusCode = HttpStatusCode.BadRequest)
{
var request = BuildRequest();
request.AddBody(body);
request.AddJsonBody(body);
return Put<object>(request, statusCode);
}

6
src/NzbDrone.Integration.Test/Client/SeriesClient.cs
View File

@ -14,15 +14,15 @@ namespace NzbDrone.Integration.Test.Client
public List<SeriesResource> Lookup(string term)
{
var request = BuildRequest("lookup?term={term}");
request.AddUrlSegment("term", term);
var request = BuildRequest("lookup");
request.AddQueryParameter("term", term);
return Get<List<SeriesResource>>(request);
}
public List<SeriesResource> Editor(List<SeriesResource> series)
{
var request = BuildRequest("editor");
request.AddBody(series);
request.AddJsonBody(series);
return Put<List<SeriesResource>>(request);
}

2
src/NzbDrone.Mono/Sonarr.Mono.csproj
View File

@ -4,7 +4,7 @@
<Platforms>x86</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="NLog" Version="4.6.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />

2
src/NzbDrone.SignalR/Sonarr.SignalR.csproj
View File

@ -9,7 +9,7 @@
<PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.1.0" />
<PackageReference Include="Microsoft.Owin.Security" Version="3.1.0" />
<PackageReference Include="Microsoft.Owin.SelfHost" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />

4
src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj
View File

@ -8,9 +8,9 @@
<PackageReference Include="FluentAssertions" Version="4.19.0" />
<PackageReference Include="FluentValidation" Version="8.4.0" />
<PackageReference Include="Moq" Version="4.0.10827" />
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="NLog" Version="4.6.6" />
<PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="RestSharp" Version="105.2.3" />
<PackageReference Include="RestSharp" Version="106.6.10" />
<PackageReference Include="Unity" Version="2.1.505.2" />
</ItemGroup>
<ItemGroup>

2
src/NzbDrone.Update/Sonarr.Update.csproj
View File

@ -5,7 +5,7 @@
<Platforms>x86</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="NLog" Version="4.6.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />

2
src/NzbDrone.Windows/Sonarr.Windows.csproj
View File

@ -4,7 +4,7 @@
<Platforms>x86</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="NLog" Version="4.6.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />

4
src/Sonarr.Api.V3/Sonarr.Api.V3.csproj
View File

@ -9,8 +9,8 @@
<PackageReference Include="Nancy" Version="1.4.4" />
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
<PackageReference Include="Nancy.Authentication.Forms" Version="1.4.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NLog" Version="4.6.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />

4
src/Sonarr.Http/Sonarr.Http.csproj
View File

@ -8,8 +8,8 @@
<PackageReference Include="Nancy" Version="1.4.4" />
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
<PackageReference Include="Nancy.Authentication.Forms" Version="1.4.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NLog" Version="4.5.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NLog" Version="4.6.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />