Updated NLog to 4.6.6, Newtonsoft.Json to 12.0.2, RestSharp to 106.6.10
This commit is contained in:
parent
896e824ca1
commit
2b7893c834
|
@ -8,7 +8,7 @@
|
||||||
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
|
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\LogentriesCore\LogentriesCore.csproj" />
|
<ProjectReference Include="..\LogentriesCore\LogentriesCore.csproj" />
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<PackageReference Include="Nancy" Version="1.4.4" />
|
<PackageReference Include="Nancy" Version="1.4.4" />
|
||||||
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
|
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
|
||||||
<PackageReference Include="Nancy.Authentication.Forms" 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>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
||||||
|
|
|
@ -29,7 +29,7 @@ namespace NzbDrone.Common.Serializer
|
||||||
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
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 VersionConverter());
|
||||||
serializerSettings.Converters.Add(new HttpUriConverter());
|
serializerSettings.Converters.Add(new HttpUriConverter());
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DotNet4.SocksProxy" Version="1.3.4.0" />
|
<PackageReference Include="DotNet4.SocksProxy" Version="1.3.4.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
<PackageReference Include="SharpRaven" Version="2.4.0" />
|
<PackageReference Include="SharpRaven" Version="2.4.0" />
|
||||||
<PackageReference Include="SharpZipLib" Version="1.2.0" />
|
<PackageReference Include="SharpZipLib" Version="1.2.0" />
|
||||||
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
|
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace NzbDrone.Core.Datastore.Converters
|
||||||
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
||||||
};
|
};
|
||||||
|
|
||||||
SerializerSetting.Converters.Add(new StringEnumConverter { CamelCaseText = true });
|
SerializerSetting.Converters.Add(new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() });
|
||||||
SerializerSetting.Converters.Add(new VersionConverter());
|
SerializerSetting.Converters.Add(new VersionConverter());
|
||||||
|
|
||||||
foreach (var converter in converters)
|
foreach (var converter in converters)
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
<PackageReference Include="FluentMigrator.Runner" Version="1.6.2" />
|
<PackageReference Include="FluentMigrator.Runner" Version="1.6.2" />
|
||||||
<PackageReference Include="FluentValidation" Version="8.4.0" />
|
<PackageReference Include="FluentValidation" Version="8.4.0" />
|
||||||
<PackageReference Include="ImageResizer" Version="3.4.3" />
|
<PackageReference Include="ImageResizer" Version="3.4.3" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
<PackageReference Include="OAuth" Version="1.0.3" />
|
<PackageReference Include="OAuth" Version="1.0.3" />
|
||||||
<PackageReference Include="Prowlin" Version="0.9.4456.26422" />
|
<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="TinyTwitter" Version="1.1.2" />
|
||||||
<PackageReference Include="xmlrpcnet" Version="2.5.0" />
|
<PackageReference Include="xmlrpcnet" Version="2.5.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace NzbDrone.Integration.Test.ApiTests
|
||||||
body.Add("publishDate", DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ssZ", CultureInfo.InvariantCulture));
|
body.Add("publishDate", DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ssZ", CultureInfo.InvariantCulture));
|
||||||
|
|
||||||
var request = ReleasePush.BuildRequest();
|
var request = ReleasePush.BuildRequest();
|
||||||
request.AddBody(body);
|
request.AddJsonBody(body);
|
||||||
var result = ReleasePush.Post<ReleaseResource>(request, HttpStatusCode.OK);
|
var result = ReleasePush.Post<ReleaseResource>(request, HttpStatusCode.OK);
|
||||||
|
|
||||||
result.Should().NotBeNull();
|
result.Should().NotBeNull();
|
||||||
|
|
|
@ -104,14 +104,14 @@ namespace NzbDrone.Integration.Test.Client
|
||||||
public TResource Post(TResource body, HttpStatusCode statusCode = HttpStatusCode.Created)
|
public TResource Post(TResource body, HttpStatusCode statusCode = HttpStatusCode.Created)
|
||||||
{
|
{
|
||||||
var request = BuildRequest();
|
var request = BuildRequest();
|
||||||
request.AddBody(body);
|
request.AddJsonBody(body);
|
||||||
return Post<TResource>(request, statusCode);
|
return Post<TResource>(request, statusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResource Put(TResource body, HttpStatusCode statusCode = HttpStatusCode.Accepted)
|
public TResource Put(TResource body, HttpStatusCode statusCode = HttpStatusCode.Accepted)
|
||||||
{
|
{
|
||||||
var request = BuildRequest();
|
var request = BuildRequest();
|
||||||
request.AddBody(body);
|
request.AddJsonBody(body);
|
||||||
return Put<TResource>(request, statusCode);
|
return Put<TResource>(request, statusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -142,14 +142,14 @@ namespace NzbDrone.Integration.Test.Client
|
||||||
public object InvalidPost(TResource body, HttpStatusCode statusCode = HttpStatusCode.BadRequest)
|
public object InvalidPost(TResource body, HttpStatusCode statusCode = HttpStatusCode.BadRequest)
|
||||||
{
|
{
|
||||||
var request = BuildRequest();
|
var request = BuildRequest();
|
||||||
request.AddBody(body);
|
request.AddJsonBody(body);
|
||||||
return Post<object>(request, statusCode);
|
return Post<object>(request, statusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object InvalidPut(TResource body, HttpStatusCode statusCode = HttpStatusCode.BadRequest)
|
public object InvalidPut(TResource body, HttpStatusCode statusCode = HttpStatusCode.BadRequest)
|
||||||
{
|
{
|
||||||
var request = BuildRequest();
|
var request = BuildRequest();
|
||||||
request.AddBody(body);
|
request.AddJsonBody(body);
|
||||||
return Put<object>(request, statusCode);
|
return Put<object>(request, statusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,15 +14,15 @@ namespace NzbDrone.Integration.Test.Client
|
||||||
|
|
||||||
public List<SeriesResource> Lookup(string term)
|
public List<SeriesResource> Lookup(string term)
|
||||||
{
|
{
|
||||||
var request = BuildRequest("lookup?term={term}");
|
var request = BuildRequest("lookup");
|
||||||
request.AddUrlSegment("term", term);
|
request.AddQueryParameter("term", term);
|
||||||
return Get<List<SeriesResource>>(request);
|
return Get<List<SeriesResource>>(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SeriesResource> Editor(List<SeriesResource> series)
|
public List<SeriesResource> Editor(List<SeriesResource> series)
|
||||||
{
|
{
|
||||||
var request = BuildRequest("editor");
|
var request = BuildRequest("editor");
|
||||||
request.AddBody(series);
|
request.AddJsonBody(series);
|
||||||
return Put<List<SeriesResource>>(request);
|
return Put<List<SeriesResource>>(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<Platforms>x86</Platforms>
|
<Platforms>x86</Platforms>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />
|
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.1.0" />
|
<PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.1.0" />
|
||||||
<PackageReference Include="Microsoft.Owin.Security" Version="3.1.0" />
|
<PackageReference Include="Microsoft.Owin.Security" Version="3.1.0" />
|
||||||
<PackageReference Include="Microsoft.Owin.SelfHost" 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>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
||||||
|
|
|
@ -8,9 +8,9 @@
|
||||||
<PackageReference Include="FluentAssertions" Version="4.19.0" />
|
<PackageReference Include="FluentAssertions" Version="4.19.0" />
|
||||||
<PackageReference Include="FluentValidation" Version="8.4.0" />
|
<PackageReference Include="FluentValidation" Version="8.4.0" />
|
||||||
<PackageReference Include="Moq" Version="4.0.10827" />
|
<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="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" />
|
<PackageReference Include="Unity" Version="2.1.505.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<Platforms>x86</Platforms>
|
<Platforms>x86</Platforms>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />
|
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<Platforms>x86</Platforms>
|
<Platforms>x86</Platforms>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />
|
<ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
<PackageReference Include="Nancy" Version="1.4.4" />
|
<PackageReference Include="Nancy" Version="1.4.4" />
|
||||||
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
|
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
|
||||||
<PackageReference Include="Nancy.Authentication.Forms" 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" />
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
<PackageReference Include="Nancy" Version="1.4.4" />
|
<PackageReference Include="Nancy" Version="1.4.4" />
|
||||||
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
|
<PackageReference Include="Nancy.Authentication.Basic" Version="1.4.1" />
|
||||||
<PackageReference Include="Nancy.Authentication.Forms" 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" />
|
||||||
<PackageReference Include="NLog" Version="4.5.3" />
|
<PackageReference Include="NLog" Version="4.6.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
<ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
|
||||||
|
|
Loading…
Reference in New Issue