Browse Source

chore: update dependencies (#2977)

pull/2978/head
Jason Dove 1 month ago committed by GitHub
parent
commit
aae2529f22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
  2. 6
      ErsatzTV.Core/ErsatzTV.Core.csproj
  3. 2
      ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj
  4. 2
      ErsatzTV.Infrastructure.Sqlite/ErsatzTV.Infrastructure.Sqlite.csproj
  5. 2
      ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj
  6. 12
      ErsatzTV.Infrastructure/Emby/EmbyApiClient.cs
  7. 14
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  8. 4
      ErsatzTV.Infrastructure/GitHub/GitHubApiClient.cs
  9. 2
      ErsatzTV.Infrastructure/Jellyfin/JellyfinApiClient.cs
  10. 8
      ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs
  11. 2
      ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj
  12. 6
      ErsatzTV/ErsatzTV.csproj
  13. 4
      ErsatzTV/Startup.cs

2
ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="NSubstitute" Version="6.0.0" />
<PackageReference Include="NSubstitute" Version="6.1.0" />
<PackageReference Include="NUnit" Version="4.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Serilog" Version="4.4.0" />

6
ErsatzTV.Core/ErsatzTV.Core.csproj

@ -21,12 +21,12 @@ @@ -21,12 +21,12 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageReference Include="NCalcSync" Version="6.4.0" />
<PackageReference Include="NCalcSync" Version="7.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Serilog" Version="4.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="SkiaSharp" Version="4.150.1" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="4.150.1" />
<PackageReference Include="SkiaSharp" Version="4.151.1" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="4.151.1" />
<PackageReference Include="System.CommandLine" Version="2.0.10" />
<PackageReference Include="Testably.Abstractions" Version="10.3.0" />
<PackageReference Include="TimeSpanParserUtil" Version="1.2.0" />

2
ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="NSubstitute" Version="6.0.0" />
<PackageReference Include="NSubstitute" Version="6.1.0" />
<PackageReference Include="NUnit" Version="4.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />

2
ErsatzTV.Infrastructure.Sqlite/ErsatzTV.Infrastructure.Sqlite.csproj

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.15" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.15" />
<!-- Force fixed native SQLite to resolve NU1903 (GHSA-2m69-gcr7-jv3q) from the transitive 2.1.10 -->
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.4" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
</ItemGroup>

2
ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="NSubstitute" Version="6.0.0" />
<PackageReference Include="NSubstitute" Version="6.1.0" />
<PackageReference Include="NUnit" Version="4.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.14.0">

12
ErsatzTV.Infrastructure/Emby/EmbyApiClient.cs

@ -33,7 +33,7 @@ public class EmbyApiClient : IEmbyApiClient @@ -33,7 +33,7 @@ public class EmbyApiClient : IEmbyApiClient
{
try
{
IEmbyApi service = RestService.For<IEmbyApi>(address);
IEmbyApi service = RestService.ForGenerated<IEmbyApi>(address);
var cts = new CancellationTokenSource();
cts.CancelAfter(TimeSpan.FromSeconds(5));
return await service.GetSystemInformation(apiKey, cts.Token)
@ -55,7 +55,7 @@ public class EmbyApiClient : IEmbyApiClient @@ -55,7 +55,7 @@ public class EmbyApiClient : IEmbyApiClient
{
try
{
IEmbyApi service = RestService.For<IEmbyApi>(address);
IEmbyApi service = RestService.ForGenerated<IEmbyApi>(address);
List<EmbyLibraryResponse> libraries = await service.GetLibraries(apiKey);
return libraries
.Map(Project)
@ -177,7 +177,7 @@ public class EmbyApiClient : IEmbyApiClient @@ -177,7 +177,7 @@ public class EmbyApiClient : IEmbyApiClient
{
try
{
IEmbyApi service = RestService.For<IEmbyApi>(address);
IEmbyApi service = RestService.ForGenerated<IEmbyApi>(address);
EmbyPlaybackInfoResponse playbackInfo = await service.GetPlaybackInfo(apiKey, itemId);
Option<MediaVersion> maybeVersion = ProjectToMediaVersion(playbackInfo);
return maybeVersion.ToEither(() => BaseError.New("Unable to locate Emby statistics"));
@ -197,7 +197,7 @@ public class EmbyApiClient : IEmbyApiClient @@ -197,7 +197,7 @@ public class EmbyApiClient : IEmbyApiClient
{
try
{
IEmbyApi service = RestService.For<IEmbyApi>(address);
IEmbyApi service = RestService.ForGenerated<IEmbyApi>(address);
EmbyLibraryItemsResponse itemsResponse = await service.GetShowLibraryItems(
apiKey,
library.ItemId,
@ -228,7 +228,7 @@ public class EmbyApiClient : IEmbyApiClient @@ -228,7 +228,7 @@ public class EmbyApiClient : IEmbyApiClient
{
try
{
IEmbyApi service = RestService.For<IEmbyApi>(address);
IEmbyApi service = RestService.ForGenerated<IEmbyApi>(address);
EmbySearchHintsResponse searchResponse = await service.SearchHints(
apiKey,
showTitle,
@ -276,7 +276,7 @@ public class EmbyApiClient : IEmbyApiClient @@ -276,7 +276,7 @@ public class EmbyApiClient : IEmbyApiClient
Func<IEmbyApi, string, int, int, Task<EmbyLibraryItemsResponse>> getItems,
Func<Option<EmbyLibrary>, EmbyLibraryItemResponse, Option<TItem>> mapper)
{
IEmbyApi service = RestService.For<IEmbyApi>(address);
IEmbyApi service = RestService.ForGenerated<IEmbyApi>(address);
const int PAGE_SIZE = 10;
int pages = int.MaxValue;

14
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@ -16,10 +16,10 @@ @@ -16,10 +16,10 @@
<PackageReference Include="CliWrap" Version="3.10.4" />
<PackageReference Include="Dapper" Version="2.1.79" />
<PackageReference Include="EFCore.BulkExtensions" Version="[9.0.2,10)" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.4.2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.5.0" />
<PackageReference Include="Humanizer.Core" Version="3.0.10" />
<PackageReference Include="Jint" Version="4.14.0" />
<PackageReference Include="JsonSchema.Net" Version="9.3.0" />
<PackageReference Include="Jint" Version="4.15.3" />
<PackageReference Include="JsonSchema.Net" Version="9.4.0" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00018" />
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00018" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00018" />
@ -30,13 +30,13 @@ @@ -30,13 +30,13 @@
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.15" />
<PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
<PackageReference Include="Refit" Version="13.1.0" />
<PackageReference Include="Refit.Newtonsoft.Json" Version="13.1.0" />
<PackageReference Include="Refit.Xml" Version="13.1.0" />
<PackageReference Include="Refit" Version="15.0.0" />
<PackageReference Include="Refit.Newtonsoft.Json" Version="15.0.0" />
<PackageReference Include="Refit.Xml" Version="15.0.0" />
<PackageReference Include="RichTextKit.Stbear" Version="0.4.167.3" />
<PackageReference Include="Scriban.Signed" Version="7.2.6" />
<PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12,4)" />
<PackageReference Include="SkiaSharp" Version="4.150.1" />
<PackageReference Include="SkiaSharp" Version="4.151.1" />
<PackageReference Include="TagLibSharp" Version="2.3.0" />
<PackageReference Include="TimeZoneConverter" Version="7.2.0" />
</ItemGroup>

4
ErsatzTV.Infrastructure/GitHub/GitHubApiClient.cs

@ -10,7 +10,7 @@ public class GitHubApiClient : IGitHubApiClient @@ -10,7 +10,7 @@ public class GitHubApiClient : IGitHubApiClient
{
try
{
IGitHubApi service = RestService.For<IGitHubApi>("https://api.github.com");
IGitHubApi service = RestService.ForGenerated<IGitHubApi>("https://api.github.com");
return await service.GetReleases(cancellationToken).Map(releases => releases.Head().Body);
}
catch (Exception ex)
@ -23,7 +23,7 @@ public class GitHubApiClient : IGitHubApiClient @@ -23,7 +23,7 @@ public class GitHubApiClient : IGitHubApiClient
{
try
{
IGitHubApi service = RestService.For<IGitHubApi>("https://api.github.com");
IGitHubApi service = RestService.ForGenerated<IGitHubApi>("https://api.github.com");
return await service.GetTag(tag, cancellationToken).Map(t => t.Body);
}
catch (Exception ex)

2
ErsatzTV.Infrastructure/Jellyfin/JellyfinApiClient.cs

@ -1124,6 +1124,6 @@ public class JellyfinApiClient : IJellyfinApiClient @@ -1124,6 +1124,6 @@ public class JellyfinApiClient : IJellyfinApiClient
{
var client = _httpClientFactory.CreateClient("RefitCustomClient");
client.BaseAddress = new Uri(address);
return RestService.For<IJellyfinApi>(client);
return RestService.ForGenerated<IJellyfinApi>(client);
}
}

8
ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs

@ -42,7 +42,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient> @@ -42,7 +42,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient>
{
try
{
IPlexServerApi service = RestService.For<IPlexServerApi>(
IPlexServerApi service = RestService.ForGenerated<IPlexServerApi>(
new HttpClient
{
BaseAddress = new Uri(connection.Uri),
@ -416,7 +416,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient> @@ -416,7 +416,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient>
{
try
{
IPlexServerApi service = RestService.For<IPlexServerApi>(
IPlexServerApi service = RestService.ForGenerated<IPlexServerApi>(
new HttpClient { BaseAddress = new Uri(connection.Uri) });
PlexMediaContainerResponse<PlexMediaContainerHubContent<PlexHubResponse>> searchResponse =
@ -466,7 +466,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient> @@ -466,7 +466,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient>
const int PAGE_SIZE = 10;
IPlexServerApi jsonService = RestService.For<IPlexServerApi>(connection.Uri);
IPlexServerApi jsonService = RestService.ForGenerated<IPlexServerApi>(connection.Uri);
int pages = (size - 1) / PAGE_SIZE + 1;
for (var i = 0; i < pages; i++)
@ -490,7 +490,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient> @@ -490,7 +490,7 @@ public class PlexServerApiClient(PlexEtag plexEtag, ILogger<PlexServerApiClient>
TimeSpan httpClientTimeout = timeout ?? TimeSpan.FromSeconds(30);
return RestService.For<IPlexServerApi>(
return RestService.ForGenerated<IPlexServerApi>(
new HttpClient
{
BaseAddress = new Uri(uri),

2
ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="LanguageExt.Core" Version="4.4.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="NSubstitute" Version="6.0.0" />
<PackageReference Include="NSubstitute" Version="6.1.0" />
<PackageReference Include="NUnit" Version="4.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.14.0">

6
ErsatzTV/ErsatzTV.csproj

@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
<PackageReference Include="Heron.MudCalendar" Version="4.0.1" />
<PackageReference Include="HtmlSanitizer" Version="9.0.967" />
<PackageReference Include="HtmlSanitizer" Version="9.2.995" />
<PackageReference Include="LanguageExt.Core" Version="4.4.9" />
<PackageReference Include="Markdig" Version="1.3.2" />
<PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" />
@ -56,9 +56,9 @@ @@ -56,9 +56,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MudBlazor" Version="9.7.0" />
<PackageReference Include="MudBlazor" Version="9.8.0" />
<PackageReference Include="NaturalSort.Extension" Version="4.4.1" />
<PackageReference Include="Refit.HttpClientFactory" Version="13.1.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="15.0.0" />
<PackageReference Include="Scalar.AspNetCore" Version="2.16.18" />
<PackageReference Include="Serilog" Version="4.4.0" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />

4
ErsatzTV/Startup.cs

@ -471,10 +471,10 @@ public class Startup @@ -471,10 +471,10 @@ public class Startup
services.AddMediatR(config => config.RegisterServicesFromAssemblyContaining<GetAllChannels>());
services.AddRefitClient<IPlexTvApi>()
services.AddRefitGeneratedClient<IPlexTvApi>()
.ConfigureHttpClient(c => c.BaseAddress = new Uri("https://plex.tv/api/v2"));
services.AddRefitClient<ITraktApi>(
services.AddRefitGeneratedClient<ITraktApi>(
new RefitSettings
{
ContentSerializer = new NewtonsoftJsonContentSerializer(

Loading…
Cancel
Save