Mirrors/roadie
2
0
Fork 0
mirror of https://github.com/sphildreth/roadie synced 2024-11-10 06:44:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated NuGet packages.

Browse source
This commit is contained in:
Steven Hildreth 2020-01-18 13:31:05 -06:00
parent b8bdf0d7c4
commit a5498ff7a7
10 changed files with 48 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Inspector/Inspector.csproj
View file

@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.5.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
</ItemGroup>
<ItemGroup>

2
Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj
View file

@ -23,7 +23,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

3
Roadie.Api.Library/Data/CollectionPartial.cs
View file

@ -7,6 +7,7 @@ using Roadie.Library.Utility;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
namespace Roadie.Library.Data
@ -123,7 +124,7 @@ namespace Roadie.Library.Data
using (var sr = new StringReader(ListInCSV))
{
var index = 0;
var configuration = new CsvHelper.Configuration.Configuration
var configuration = new CsvHelper.Configuration.CsvConfiguration(new CultureInfo("en-US", false))
{
MissingFieldFound = null,
HasHeaderRecord = false

18
Roadie.Api.Library/Roadie.Library.csproj
View file

@ -9,9 +9,9 @@
<ItemGroup>
<PackageReference Include="AutoCompare.Core" Version="1.0.0" />
<PackageReference Include="CsvHelper" Version="12.2.3" />
<PackageReference Include="CsvHelper" Version="13.0.0" />
<PackageReference Include="EFCore.BulkExtensions" Version="3.1.0" />
<PackageReference Include="FluentFTP" Version="28.0.5" />
<PackageReference Include="FluentFTP" Version="29.0.2" />
<PackageReference Include="Hashids.net" Version="1.3.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.17" />
<PackageReference Include="IdSharp.Common" Version="1.0.1" />
@ -19,19 +19,19 @@
<PackageReference Include="Inflatable.Lastfm" Version="1.1.0.339" />
<PackageReference Include="LiteDB" Version="4.1.4" />
<PackageReference Include="Mapster" Version="4.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.3.2" />
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.3" />
<PackageReference Include="MimeMapping" Version="1.0.1.26" />
<PackageReference Include="NodaTime" Version="2.4.7" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
<PackageReference Include="RestSharp" Version="106.6.10" />
<PackageReference Include="RestSharp" Version="106.10.1" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0008" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0007" />
@ -39,7 +39,7 @@
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Runtime.Caching" Version="4.7.0" />
<PackageReference Include="z440.atl.core" Version="2.15.0" />
<PackageReference Include="z440.atl.core" Version="2.16.0" />
<PackageReference Include="zlib.net-mutliplatform" Version="1.0.4" />
</ItemGroup>

34
Roadie.Api.Library/SearchEngines/Imaging/BingImageSearchEngine.cs
View file

@ -37,34 +37,10 @@ namespace Roadie.Library.SearchEngines.Imaging
request.AddHeader("Ocp-Apim-Subscription-Key", ApiKey.Key);
request.AddParameter(new Parameter
{
Name = "count",
Value = resultsCount > 0 ? resultsCount : 10,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "safeSearch",
Value = "Off",
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "aspect",
Value = "Square",
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "q",
Value = string.Format("'{0}'", query.Trim()),
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("count", resultsCount > 0 ? resultsCount : 10, ParameterType.GetOrPost));
request.AddParameter(new Parameter("safeSearch", "Off", ParameterType.GetOrPost));
request.AddParameter(new Parameter("aspect", "Square", ParameterType.GetOrPost));
request.AddParameter(new Parameter("q", string.Format("'{0}'", query.Trim()), ParameterType.GetOrPost));
return request;
}
@ -72,7 +48,7 @@ namespace Roadie.Library.SearchEngines.Imaging
{
var request = BuildRequest(query, resultsCount);
var response = await _client.ExecuteTaskAsync<BingImageResult>(request);
var response = await _client.ExecuteAsync<BingImageResult>(request);
if (response.StatusCode == HttpStatusCode.Unauthorized)
throw new AuthenticationException("Api Key is not correct");

32
Roadie.Api.Library/SearchEngines/Imaging/ITunesSearchEngine.cs
View file

@ -169,34 +169,12 @@ namespace Roadie.Library.SearchEngines.Imaging
};
if (resultsCount > 0)
request.AddParameter(new Parameter
{
Name = "limit",
Value = resultsCount,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "entity",
Value = entityType,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "country",
Value = "us",
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "term",
Value = string.Format("'{0}'", query.Trim()),
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("limit", resultsCount, ParameterType.GetOrPost));
}
request.AddParameter(new Parameter("entity", entityType, ParameterType.GetOrPost));
request.AddParameter(new Parameter("country", "us", ParameterType.GetOrPost));
request.AddParameter(new Parameter("term", string.Format("'{0}'", query.Trim()), ParameterType.GetOrPost));
return request;
}
}

95
Roadie.Api.Library/SearchEngines/MetaData/Discogs/DiscogsHelper.cs
View file

@ -328,19 +328,8 @@ namespace Roadie.Library.SearchEngines.MetaData.Discogs
RequestFormat = DataFormat.Json
};
request.AddUrlSegment("id", artistId.ToString());
request.AddParameter(new Parameter
{
Name = "key",
Value = ApiKey.Key,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "secret",
Value = ApiKey.KeySecret,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("key", ApiKey.Key, ParameterType.GetOrPost));
request.AddParameter(new Parameter("secret", ApiKey.KeySecret, ParameterType.GetOrPost));
return request;
}
@ -353,19 +342,8 @@ namespace Roadie.Library.SearchEngines.MetaData.Discogs
RequestFormat = DataFormat.Json
};
request.AddUrlSegment("id", artistId.ToString());
request.AddParameter(new Parameter
{
Name = "key",
Value = ApiKey.Key,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "secret",
Value = ApiKey.KeySecret,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("key", ApiKey.Key, ParameterType.GetOrPost));
request.AddParameter(new Parameter("secret", ApiKey.KeySecret, ParameterType.GetOrPost));
return request;
}
@ -378,19 +356,8 @@ namespace Roadie.Library.SearchEngines.MetaData.Discogs
RequestFormat = DataFormat.Json
};
request.AddUrlSegment("id", releaseId.ToString());
request.AddParameter(new Parameter
{
Name = "key",
Value = ApiKey.Key,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "secret",
Value = ApiKey.KeySecret,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("key", ApiKey.Key, ParameterType.GetOrPost));
request.AddParameter(new Parameter("secret", ApiKey.KeySecret, ParameterType.GetOrPost));
return request;
}
@ -404,52 +371,18 @@ namespace Roadie.Library.SearchEngines.MetaData.Discogs
};
if (resultsCount > 0)
{
request.AddParameter(new Parameter
{
Name = "page",
Value = 1,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "per_page",
Value = resultsCount,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("page", 1, ParameterType.GetOrPost));
request.AddParameter(new Parameter("per_page", resultsCount, ParameterType.GetOrPost));
}
request.AddParameter(new Parameter
{
Name = "type",
Value = entityType,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "q",
Value = string.Format("'{0}'", query.Trim()),
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("type", entityType, ParameterType.GetOrPost));
request.AddParameter(new Parameter("q", string.Format("'{0}'", query.Trim()), ParameterType.GetOrPost));
if (!string.IsNullOrEmpty(artist))
request.AddParameter(new Parameter
{
Name = "artist",
Value = string.Format("'{0}'", artist.Trim()),
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "key",
Value = ApiKey.Key,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "secret",
Value = ApiKey.KeySecret,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("artist", string.Format("'{0}'", artist.Trim()), ParameterType.GetOrPost));
}
request.AddParameter(new Parameter("key", ApiKey.Key, ParameterType.GetOrPost));
request.AddParameter(new Parameter("secret", ApiKey.KeySecret, ParameterType.GetOrPost));
return request;
}
}

21
Roadie.Api.Library/SearchEngines/MetaData/Spotify/SpotifyHelper.cs
View file

@ -231,24 +231,9 @@ namespace Roadie.Library.SearchEngines.MetaData.Spotify
Method = Method.GET,
RequestFormat = DataFormat.Json
};
request.AddParameter(new Parameter
{
Name = "type",
Value = entityType,
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "q",
Value = string.Format("{0}", query.Trim()),
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter
{
Name = "market",
Value = "US",
Type = ParameterType.GetOrPost
});
request.AddParameter(new Parameter("type", entityType, ParameterType.GetOrPost));
request.AddParameter(new Parameter("q", string.Format("{0}", query.Trim()), ParameterType.GetOrPost));
request.AddParameter(new Parameter("market", "US", ParameterType.GetOrPost));
return request;
}
}

4
Roadie.Api.Services/Roadie.Api.Services.csproj
View file

@ -7,10 +7,10 @@
<ItemGroup>
<PackageReference Include="Hashids.net" Version="1.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.19" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.20" />
</ItemGroup>
<ItemGroup>

12
Roadie.Api/Roadie.Api.csproj
View file

@ -31,14 +31,14 @@
<PackageReference Include="BCrypt-Core" Version="2.0.0" />
<PackageReference Include="Mapster" Version="4.1.1" />
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.12.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
@ -49,7 +49,7 @@
<PackageReference Include="Serilog.Sinks.LiteDB.NetStandard" Version="1.0.14" />
<PackageReference Include="Serilog.Sinks.RollingFileAlternate" Version="2.0.9" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.19" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.20" />
</ItemGroup>
<ItemGroup>