Browse Source

even more dependency updates (#2848)

* upgrade mudblazor

* update coverlet collector

* update scriban
pull/2849/head
Jason Dove 1 month ago committed by GitHub
parent
commit
848db7eaf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      ErsatzTV.Core/Hdhr/Discover.cs
  2. 2
      ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj
  3. 2
      ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj
  4. 2
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  5. 2
      ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj
  6. 4
      ErsatzTV/ErsatzTV.csproj
  7. 2
      ErsatzTV/Pages/ChannelEditor.razor
  8. 2
      ErsatzTV/Pages/CollectionEditor.razor
  9. 2
      ErsatzTV/Pages/FFmpegEditor.razor
  10. 2
      ErsatzTV/Pages/FillerPresetEditor.razor
  11. 2
      ErsatzTV/Pages/LocalLibraryEditor.razor
  12. 2
      ErsatzTV/Pages/MultiCollectionEditor.razor
  13. 2
      ErsatzTV/Pages/PlayoutEditor.razor
  14. 2
      ErsatzTV/Pages/RerunCollectionEditor.razor
  15. 2
      ErsatzTV/Pages/ScheduleEditor.razor
  16. 2
      ErsatzTV/Pages/ScheduleItemsEditor.razor
  17. 2
      ErsatzTV/Pages/Settings/FFmpegSettings.razor
  18. 2
      ErsatzTV/Pages/Settings/HDHRSettings.razor
  19. 2
      ErsatzTV/Pages/Settings/PlayoutSettings.razor
  20. 2
      ErsatzTV/Pages/Settings/ScannerSettings.razor
  21. 2
      ErsatzTV/Pages/SmartCollectionEditor.razor
  22. 2
      ErsatzTV/Pages/TraktListEditor.razor
  23. 12
      ErsatzTV/Pages/Troubleshooting/PlaybackTroubleshooting.razor
  24. 2
      ErsatzTV/Pages/WatermarkEditor.razor
  25. 2
      ErsatzTV/Shared/MainLayout.razor
  26. 4
      ErsatzTV/ViewModels/BlockItemEditViewModel.cs
  27. 4
      ErsatzTV/ViewModels/DecoEditViewModel.cs
  28. 4
      ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs

2
ErsatzTV.Core/Hdhr/Discover.cs

@ -25,7 +25,7 @@ public class Discover
public string FriendlyName => "ErsatzTV"; public string FriendlyName => "ErsatzTV";
public string LineupURL => $"{_scheme}://{_host}/lineup.json"; public string LineupURL => $"{_scheme}://{_host}/lineup.json";
public string Manufacturer => "ErsatzTV"; public string Manufacturer => "ErsatzTV";
public string ManufacturerURL => "https://github.com/ErsatzTV/ErsatzTV"; public string ManufacturerURL => "https://github.com/ErsatzTV/legacy";
public string ModelNumber => "HDTC-2US"; public string ModelNumber => "HDTC-2US";
public int TunerCount { get; } public int TunerCount { get; }
} }

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

@ -15,7 +15,7 @@
<PackageReference Include="NUnit" Version="4.5.1" /> <PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" /> <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Shouldly" Version="4.3.0" /> <PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4"> <PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

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

@ -17,7 +17,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.4"> <PackageReference Include="coverlet.collector" Version="10.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

2
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@ -34,7 +34,7 @@
<PackageReference Include="Refit.Newtonsoft.Json" Version="9.0.2" /> <PackageReference Include="Refit.Newtonsoft.Json" Version="9.0.2" />
<PackageReference Include="Refit.Xml" Version="9.0.2" /> <PackageReference Include="Refit.Xml" Version="9.0.2" />
<PackageReference Include="RichTextKit.Stbear" Version="0.4.167.3" /> <PackageReference Include="RichTextKit.Stbear" Version="0.4.167.3" />
<PackageReference Include="Scriban.Signed" Version="6.5.2" /> <PackageReference Include="Scriban.Signed" Version="7.1.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
<PackageReference Include="SkiaSharp" Version="3.119.2" /> <PackageReference Include="SkiaSharp" Version="3.119.2" />
<PackageReference Include="TagLibSharp" Version="2.3.0" /> <PackageReference Include="TagLibSharp" Version="2.3.0" />

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

@ -18,7 +18,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.4"> <PackageReference Include="coverlet.collector" Version="10.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

4
ErsatzTV/ErsatzTV.csproj

@ -35,7 +35,7 @@
<PackageReference Include="Chronic.Core" Version="0.4.0" /> <PackageReference Include="Chronic.Core" Version="0.4.0" />
<PackageReference Include="FluentValidation" Version="12.1.1" /> <PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" /> <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
<PackageReference Include="Heron.MudCalendar" Version="3.4.0" /> <PackageReference Include="Heron.MudCalendar" Version="4.0.0" />
<PackageReference Include="HtmlSanitizer" Version="9.0.892" /> <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
<PackageReference Include="LanguageExt.Core" Version="4.4.9" /> <PackageReference Include="LanguageExt.Core" Version="4.4.9" />
<PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" /> <PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" />
@ -52,7 +52,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MudBlazor" Version="8.15.0" /> <PackageReference Include="MudBlazor" Version="9.3.0" />
<PackageReference Include="NaturalSort.Extension" Version="4.4.1" /> <PackageReference Include="NaturalSort.Extension" Version="4.4.1" />
<PackageReference Include="Refit.HttpClientFactory" Version="9.0.2" /> <PackageReference Include="Refit.HttpClientFactory" Version="9.0.2" />
<PackageReference Include="Scalar.AspNetCore" Version="2.14.1" /> <PackageReference Include="Scalar.AspNetCore" Version="2.14.1" />

2
ErsatzTV/Pages/ChannelEditor.razor

@ -455,7 +455,7 @@ else
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (!_form.IsValid) if (!_form.IsValid)
{ {
return; return;

2
ErsatzTV/Pages/CollectionEditor.razor

@ -74,7 +74,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
Seq<BaseError> errorMessage = IsEdit ? (await Mediator.Send(new UpdateCollection(Id, _model.Name), _cts.Token)).LeftToSeq() : (await Mediator.Send(new CreateCollection(_model.Name), _cts.Token)).LeftToSeq(); Seq<BaseError> errorMessage = IsEdit ? (await Mediator.Send(new UpdateCollection(Id, _model.Name), _cts.Token)).LeftToSeq() : (await Mediator.Send(new CreateCollection(_model.Name), _cts.Token)).LeftToSeq();

2
ErsatzTV/Pages/FFmpegEditor.razor

@ -470,7 +470,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (!_form.IsValid) if (!_form.IsValid)
{ {
return; return;

2
ErsatzTV/Pages/FillerPresetEditor.razor

@ -395,7 +395,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
ValidationResult result = await _validator.ValidateAsync(_model, _cts.Token); ValidationResult result = await _validator.ValidateAsync(_model, _cts.Token);
if (result.IsValid) if (result.IsValid)
{ {

2
ErsatzTV/Pages/LocalLibraryEditor.razor

@ -229,7 +229,7 @@
private async Task SaveChangesAsync() private async Task SaveChangesAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
Either<BaseError, LocalLibraryViewModel> result = IsEdit Either<BaseError, LocalLibraryViewModel> result = IsEdit

2
ErsatzTV/Pages/MultiCollectionEditor.razor

@ -190,7 +190,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
Seq<BaseError> errorMessage = IsEdit ? (await Mediator.Send(new UpdateMultiCollection(Id, _model.Name, GetUpdateItems()), _cts.Token)).LeftToSeq() : (await Mediator.Send(new CreateMultiCollection(_model.Name, GetCreateItems()), _cts.Token)).LeftToSeq(); Seq<BaseError> errorMessage = IsEdit ? (await Mediator.Send(new UpdateMultiCollection(Id, _model.Name, GetUpdateItems()), _cts.Token)).LeftToSeq() : (await Mediator.Send(new CreateMultiCollection(_model.Name, GetCreateItems()), _cts.Token)).LeftToSeq();

2
ErsatzTV/Pages/PlayoutEditor.razor

@ -131,7 +131,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
ValidationResult result = await _validator.ValidateAsync(_model, _cts.Token); ValidationResult result = await _validator.ValidateAsync(_model, _cts.Token);
if (result.IsValid) if (result.IsValid)
{ {

2
ErsatzTV/Pages/RerunCollectionEditor.razor

@ -329,7 +329,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
Seq<BaseError> errorMessage = IsEdit Seq<BaseError> errorMessage = IsEdit

2
ErsatzTV/Pages/ScheduleEditor.razor

@ -123,7 +123,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
Either<BaseError, EntityIdResult> result = IsEdit Either<BaseError, EntityIdResult> result = IsEdit

2
ErsatzTV/Pages/ScheduleItemsEditor.razor

@ -1064,7 +1064,7 @@
private async Task SaveChanges() private async Task SaveChanges()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (!_success) if (!_success)
{ {
return; return;

2
ErsatzTV/Pages/Settings/FFmpegSettings.razor

@ -229,7 +229,7 @@
private async Task SaveFFmpegSettings() private async Task SaveFFmpegSettings()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
Either<BaseError, Unit> result = await Mediator.Send(new UpdateFFmpegSettings(_ffmpegSettings), _cts.Token); Either<BaseError, Unit> result = await Mediator.Send(new UpdateFFmpegSettings(_ffmpegSettings), _cts.Token);

2
ErsatzTV/Pages/Settings/HDHRSettings.razor

@ -69,7 +69,7 @@
private async Task SaveHDHRSettings() private async Task SaveHDHRSettings()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_hdhrSuccess) if (_hdhrSuccess)
{ {
Either<BaseError, Unit> result = await Mediator.Send(new UpdateHDHRTunerCount(_tunerCount), _cts.Token); Either<BaseError, Unit> result = await Mediator.Send(new UpdateHDHRTunerCount(_tunerCount), _cts.Token);

2
ErsatzTV/Pages/Settings/PlayoutSettings.razor

@ -74,7 +74,7 @@
private async Task SavePlayoutSettings() private async Task SavePlayoutSettings()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_playoutSuccess) if (_playoutSuccess)
{ {
Either<BaseError, Unit> result = await Mediator.Send(new UpdatePlayoutSettings(_playoutSettings), _cts.Token); Either<BaseError, Unit> result = await Mediator.Send(new UpdatePlayoutSettings(_playoutSettings), _cts.Token);

2
ErsatzTV/Pages/Settings/ScannerSettings.razor

@ -63,7 +63,7 @@
private async Task SaveScannerSettings() private async Task SaveScannerSettings()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_scannerSuccess) if (_scannerSuccess)
{ {
Either<BaseError, Unit> result = await Mediator.Send(new UpdateLibraryRefreshInterval(_libraryRefreshInterval), _cts.Token); Either<BaseError, Unit> result = await Mediator.Send(new UpdateLibraryRefreshInterval(_libraryRefreshInterval), _cts.Token);

2
ErsatzTV/Pages/SmartCollectionEditor.razor

@ -67,7 +67,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
Either<BaseError, UpdateSmartCollectionResult> result = await Mediator.Send(new UpdateSmartCollection(Id, _model.Name, _model.Query), _cts.Token); Either<BaseError, UpdateSmartCollectionResult> result = await Mediator.Send(new UpdateSmartCollection(Id, _model.Name, _model.Query), _cts.Token);

2
ErsatzTV/Pages/TraktListEditor.razor

@ -86,7 +86,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (_success) if (_success)
{ {
var request = new UpdateTraktList(_model.Id, _model.AutoRefresh, _model.GeneratePlaylist); var request = new UpdateTraktList(_model.Id, _model.AutoRefresh, _model.GeneratePlaylist);

12
ErsatzTV/Pages/Troubleshooting/PlaybackTroubleshooting.razor

@ -205,8 +205,8 @@
private int _ffmpegProfileId; private int _ffmpegProfileId;
private bool _channelMode; private bool _channelMode;
private string _streamSelector; private string _streamSelector;
private IEnumerable<string> _watermarkNames = new System.Collections.Generic.HashSet<string>(); private IReadOnlyCollection<string> _watermarkNames = new System.Collections.Generic.HashSet<string>();
private IEnumerable<string> _graphicsElementNames = new System.Collections.Generic.HashSet<string>(); private IReadOnlyCollection<string> _graphicsElementNames = new System.Collections.Generic.HashSet<string>();
private bool _startFromBeginning; private bool _startFromBeginning;
private int? _subtitleId; private int? _subtitleId;
private int _seekSeconds; private int _seekSeconds;
@ -292,7 +292,7 @@
private async Task PreviewChannel() private async Task PreviewChannel()
{ {
await _logsField.SetText(string.Empty); await _logsField.SetTextAsync(string.Empty);
_lastSpeed = null; _lastSpeed = null;
var baseUri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri).ToString(); var baseUri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri).ToString();
@ -421,7 +421,7 @@
private async Task HandleTroubleshootingCompleted(PlaybackTroubleshootingCompletedNotification result) private async Task HandleTroubleshootingCompleted(PlaybackTroubleshootingCompletedNotification result)
{ {
await InvokeAsync(async () => { await _logsField.SetText(string.Empty); }); await InvokeAsync(async () => { await _logsField.SetTextAsync(string.Empty); });
_lastSpeed = null; _lastSpeed = null;
foreach (double speed in result.MaybeSpeed) foreach (double speed in result.MaybeSpeed)
@ -442,14 +442,14 @@
if (FileSystem.File.Exists(logFileName)) if (FileSystem.File.Exists(logFileName))
{ {
string text = await File.ReadAllTextAsync(logFileName); string text = await File.ReadAllTextAsync(logFileName);
await InvokeAsync(async () => { await _logsField.SetText(text); }); await InvokeAsync(async () => { await _logsField.SetTextAsync(text); });
} }
else else
{ {
foreach (var exception in result.MaybeException) foreach (var exception in result.MaybeException)
{ {
string text = exception.Message + Environment.NewLine + Environment.NewLine + exception; string text = exception.Message + Environment.NewLine + Environment.NewLine + exception;
await InvokeAsync(async () => { await _logsField.SetText(text); }); await InvokeAsync(async () => { await _logsField.SetTextAsync(text); });
} }
} }
} }

2
ErsatzTV/Pages/WatermarkEditor.razor

@ -265,7 +265,7 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
await _form.Validate(); await _form.ValidateAsync();
if (!_form.IsValid) if (!_form.IsValid)
{ {
return; return;

2
ErsatzTV/Shared/MainLayout.razor

@ -102,7 +102,7 @@
<MudIconButton Icon="@Icons.Material.Filled.Chat" Color="Color.Primary" Href="https://ersatztv.org/contact" Target="_blank"/> <MudIconButton Icon="@Icons.Material.Filled.Chat" Color="Color.Primary" Href="https://ersatztv.org/contact" Target="_blank"/>
</MudTooltip> </MudTooltip>
<MudTooltip Text="@StringLocalizer["ButtonGitHub"]"> <MudTooltip Text="@StringLocalizer["ButtonGitHub"]">
<MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Primary" Href="https://github.com/ErsatzTV/ErsatzTV" Target="_blank"/> <MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Primary" Href="https://github.com/ErsatzTV/legacy" Target="_blank"/>
</MudTooltip> </MudTooltip>
<AuthorizeView> <AuthorizeView>
<form action="/account/logout" method="post"> <form action="/account/logout" method="post">

4
ErsatzTV/ViewModels/BlockItemEditViewModel.cs

@ -71,9 +71,9 @@ public class BlockItemEditViewModel : INotifyPropertyChanged
public bool DisableWatermarks { get; set; } public bool DisableWatermarks { get; set; }
public IEnumerable<WatermarkViewModel> Watermarks { get; set; } public IReadOnlyCollection<WatermarkViewModel> Watermarks { get; set; }
public IEnumerable<GraphicsElementViewModel> GraphicsElements { get; set; } public IReadOnlyCollection<GraphicsElementViewModel> GraphicsElements { get; set; }
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;

4
ErsatzTV/ViewModels/DecoEditViewModel.cs

@ -13,11 +13,11 @@ public class DecoEditViewModel
public string GroupName { get; set; } public string GroupName { get; set; }
public string Name { get; set; } public string Name { get; set; }
public DecoMode WatermarkMode { get; set; } public DecoMode WatermarkMode { get; set; }
public IEnumerable<WatermarkViewModel> Watermarks { get; set; } public IReadOnlyCollection<WatermarkViewModel> Watermarks { get; set; }
public bool UseWatermarkDuringFiller { get; set; } public bool UseWatermarkDuringFiller { get; set; }
public DecoMode GraphicsElementsMode { get; set; } public DecoMode GraphicsElementsMode { get; set; }
public IEnumerable<GraphicsElementViewModel> GraphicsElements { get; set; } public IReadOnlyCollection<GraphicsElementViewModel> GraphicsElements { get; set; }
public bool UseGraphicsElementsDuringFiller { get; set; } public bool UseGraphicsElementsDuringFiller { get; set; }
public DecoMode DefaultFillerMode { get; set; } public DecoMode DefaultFillerMode { get; set; }

4
ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs

@ -110,8 +110,8 @@ public class ProgramScheduleItemEditViewModel : INotifyPropertyChanged
public FillerPresetViewModel PostRollFiller { get; set; } public FillerPresetViewModel PostRollFiller { get; set; }
public FillerPresetViewModel TailFiller { get; set; } public FillerPresetViewModel TailFiller { get; set; }
public FillerPresetViewModel FallbackFiller { get; set; } public FillerPresetViewModel FallbackFiller { get; set; }
public IEnumerable<WatermarkViewModel> Watermarks { get; set; } public IReadOnlyCollection<WatermarkViewModel> Watermarks { get; set; }
public IEnumerable<GraphicsElementViewModel> GraphicsElements { get; set; } public IReadOnlyCollection<GraphicsElementViewModel> GraphicsElements { get; set; }
public string PreferredAudioLanguageCode { get; set; } public string PreferredAudioLanguageCode { get; set; }
public string PreferredAudioTitle { get; set; } public string PreferredAudioTitle { get; set; }
public string PreferredSubtitleLanguageCode { get; set; } public string PreferredSubtitleLanguageCode { get; set; }

Loading…
Cancel
Save