sarsoo/Selector
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

updating deps

Browse Source
This commit is contained in:
Andy Pack 2023-01-06 21:22:08 +00:00
parent faa1c55030
commit df87159225
Signed by: sarsoo
GPG Key ID: A55BA3536A5E0ED7
10 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Selector.CLI/Selector.CLI.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@ -18,11 +18,11 @@
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="NLog" Version="5.0.5" /> <PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" /> <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
<PackageReference Include="Quartz" Version="3.5.0" /> <PackageReference Include="Quartz" Version="3.5.0" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" /> <PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
<PackageReference Include="SpotifyAPI.Web" Version="6.3.0" /> <PackageReference Include="SpotifyAPI.Web" Version="7.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" /> <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
<PackageReference Include="System.CommandLine.Hosting" Version="0.3.0-alpha.21216.1" /> <PackageReference Include="System.CommandLine.Hosting" Version="0.3.0-alpha.21216.1" />
</ItemGroup> </ItemGroup>

4
Selector.Cache/Selector.Cache.csproj
View File

@ -7,9 +7,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="StackExchange.Redis" Version="2.6.70" /> <PackageReference Include="StackExchange.Redis" Version="2.6.86" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="SpotifyAPI.Web" Version="6.3.0" /> <PackageReference Include="SpotifyAPI.Web" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Selector.Data/Selector.Data.csproj
View File

@ -11,7 +11,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

14
Selector.Model/Selector.Model.csproj
View File

@ -12,20 +12,20 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
<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="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
<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="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

7
Selector.Tests/Consumer/AudioInjector.cs
View File

@ -8,6 +8,7 @@ using FluentAssertions;
using SpotifyAPI.Web; using SpotifyAPI.Web;
using Selector; using Selector;
using System.Threading;
namespace Selector.Tests namespace Selector.Tests
{ {
@ -83,7 +84,7 @@ namespace Selector.Tests
eventArgsMock.Object.Current = playingMock.Object; eventArgsMock.Object.Current = playingMock.Object;
playingMock.Object.Item = trackMock.Object; playingMock.Object.Item = trackMock.Object;
spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny<string>()).Result).Returns(() => featureMock.Object); spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny<string>(), It.IsAny<CancellationToken>()).Result).Returns(() => featureMock.Object);
var featureInjector = new AudioFeatureInjector(watcherMock.Object, spotifyMock.Object) var featureInjector = new AudioFeatureInjector(watcherMock.Object, spotifyMock.Object)
{ {
@ -111,7 +112,7 @@ namespace Selector.Tests
playingMock.Object.Item = trackMock.Object; playingMock.Object.Item = trackMock.Object;
trackMock.Object.Id = "Fake-Id"; trackMock.Object.Id = "Fake-Id";
spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny<string>()).Result).Returns(() => featureMock.Object); spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny<string>(), It.IsAny<CancellationToken>()).Result).Returns(() => featureMock.Object);
var featureInjector = new AudioFeatureInjector(watcherMock.Object, spotifyMock.Object) var featureInjector = new AudioFeatureInjector(watcherMock.Object, spotifyMock.Object)
{ {
@ -120,7 +121,7 @@ namespace Selector.Tests
await featureInjector.AsyncCallback(eventArgsMock.Object); await featureInjector.AsyncCallback(eventArgsMock.Object);
spotifyMock.Verify(m => m.GetAudioFeatures(It.IsAny<string>())); spotifyMock.Verify(m => m.GetAudioFeatures(It.IsAny<string>(), It.IsAny<CancellationToken>()));
spotifyMock.VerifyNoOtherCalls(); spotifyMock.VerifyNoOtherCalls();
timelineMock.Verify(m => m.Add(It.IsAny<AnalysedTrack>(), It.IsAny<DateTime>()), Times.Once); timelineMock.Verify(m => m.Add(It.IsAny<AnalysedTrack>(), It.IsAny<DateTime>()), Times.Once);

4
Selector.Tests/Selector.Tests.csproj
View File

@ -9,8 +9,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.8.0" /> <PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.2" /> <PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

6
Selector.Tests/Watcher/PlayerWatcher.cs
View File

@ -33,7 +33,7 @@ namespace Selector.Tests
var spotMock = new Mock<IPlayerClient>(); var spotMock = new Mock<IPlayerClient>();
var eq = new UriEqual(); var eq = new UriEqual();
spotMock.Setup(s => s.GetCurrentPlayback().Result).Returns(playingQueue.Dequeue); spotMock.Setup(s => s.GetCurrentPlayback(It.IsAny<CancellationToken>()).Result).Returns(playingQueue.Dequeue);
var watcher = new PlayerWatcher(spotMock.Object, eq); var watcher = new PlayerWatcher(spotMock.Object, eq);
@ -190,7 +190,7 @@ namespace Selector.Tests
var eq = new UriEqual(); var eq = new UriEqual();
spotMock.Setup( spotMock.Setup(
s => s.GetCurrentPlayback().Result s => s.GetCurrentPlayback(It.IsAny<CancellationToken>()).Result
).Returns(playingQueue.Dequeue); ).Returns(playingQueue.Dequeue);
var watcher = new PlayerWatcher(spotMock.Object, eq); var watcher = new PlayerWatcher(spotMock.Object, eq);
@ -224,7 +224,7 @@ namespace Selector.Tests
await Task.Delay(execTime); await Task.Delay(execTime);
tokenSource.Cancel(); tokenSource.Cancel();
spotMock.Verify(s => s.GetCurrentPlayback(), Times.Exactly(numberOfCalls)); spotMock.Verify(s => s.GetCurrentPlayback(It.IsAny<CancellationToken>()), Times.Exactly(numberOfCalls));
} }
// [Fact] // [Fact]

4
Selector.Tests/Watcher/PlaylistWatcher.cs
View File

@ -33,7 +33,7 @@ namespace Selector.Tests
var spotMock = new Mock<ISpotifyClient>(); var spotMock = new Mock<ISpotifyClient>();
spotMock.Setup(s => s.Playlists.Get(It.IsAny<string>()).Result).Returns(playlistDequeue.Dequeue); spotMock.Setup(s => s.Playlists.Get(It.IsAny<string>(), It.IsAny<CancellationToken>()).Result).Returns(playlistDequeue.Dequeue);
var config = new PlaylistWatcherConfig() { PlaylistId = "spotify:playlist:test" }; var config = new PlaylistWatcherConfig() { PlaylistId = "spotify:playlist:test" };
var watcher = new PlaylistWatcher(config, spotMock.Object); var watcher = new PlaylistWatcher(config, spotMock.Object);
@ -80,7 +80,7 @@ namespace Selector.Tests
var spotMock = new Mock<ISpotifyClient>(); var spotMock = new Mock<ISpotifyClient>();
spotMock.Setup(s => s.Playlists.Get(It.IsAny<string>()).Result).Returns(playlistDequeue.Dequeue); spotMock.Setup(s => s.Playlists.Get(It.IsAny<string>(), It.IsAny<CancellationToken>()).Result).Returns(playlistDequeue.Dequeue);
var config = new PlaylistWatcherConfig() { PlaylistId = "spotify:playlist:test" }; var config = new PlaylistWatcherConfig() { PlaylistId = "spotify:playlist:test" };
var watcher = new PlaylistWatcher(config, spotMock.Object); var watcher = new PlaylistWatcher(config, spotMock.Object);

16
Selector.Web/Selector.Web.csproj
View File

@ -14,13 +14,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
@ -28,10 +28,10 @@
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
<PackageReference Include="NLog" Version="5.0.5" /> <PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" /> <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" /> <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Selector/Selector.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="SpotifyAPI.Web" Version="6.3.0" /> <PackageReference Include="SpotifyAPI.Web" Version="7.0.0" />
<PackageReference Include="Inflatable.Lastfm" Version="1.2.0" /> <PackageReference Include="Inflatable.Lastfm" Version="1.2.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" /> <PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup> </ItemGroup>