diff --git a/Selector.CLI/Selector.CLI.csproj b/Selector.CLI/Selector.CLI.csproj index b77a6c8..e99c8ba 100644 --- a/Selector.CLI/Selector.CLI.csproj +++ b/Selector.CLI/Selector.CLI.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -18,11 +18,11 @@ - - + + - + diff --git a/Selector.Cache/Selector.Cache.csproj b/Selector.Cache/Selector.Cache.csproj index 0b83b86..842e216 100644 --- a/Selector.Cache/Selector.Cache.csproj +++ b/Selector.Cache/Selector.Cache.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/Selector.Data/Selector.Data.csproj b/Selector.Data/Selector.Data.csproj index fdc9976..f440421 100644 --- a/Selector.Data/Selector.Data.csproj +++ b/Selector.Data/Selector.Data.csproj @@ -11,7 +11,7 @@ - + diff --git a/Selector.Model/Selector.Model.csproj b/Selector.Model/Selector.Model.csproj index 963d042..25e90e1 100644 --- a/Selector.Model/Selector.Model.csproj +++ b/Selector.Model/Selector.Model.csproj @@ -12,20 +12,20 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/Selector.Tests/Consumer/AudioInjector.cs b/Selector.Tests/Consumer/AudioInjector.cs index 0be1ba4..1e3b0f9 100644 --- a/Selector.Tests/Consumer/AudioInjector.cs +++ b/Selector.Tests/Consumer/AudioInjector.cs @@ -8,6 +8,7 @@ using FluentAssertions; using SpotifyAPI.Web; using Selector; +using System.Threading; namespace Selector.Tests { @@ -83,7 +84,7 @@ namespace Selector.Tests eventArgsMock.Object.Current = playingMock.Object; playingMock.Object.Item = trackMock.Object; - spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny()).Result).Returns(() => featureMock.Object); + spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny(), It.IsAny()).Result).Returns(() => featureMock.Object); var featureInjector = new AudioFeatureInjector(watcherMock.Object, spotifyMock.Object) { @@ -111,7 +112,7 @@ namespace Selector.Tests playingMock.Object.Item = trackMock.Object; trackMock.Object.Id = "Fake-Id"; - spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny()).Result).Returns(() => featureMock.Object); + spotifyMock.Setup(m => m.GetAudioFeatures(It.IsAny(), It.IsAny()).Result).Returns(() => featureMock.Object); var featureInjector = new AudioFeatureInjector(watcherMock.Object, spotifyMock.Object) { @@ -120,7 +121,7 @@ namespace Selector.Tests await featureInjector.AsyncCallback(eventArgsMock.Object); - spotifyMock.Verify(m => m.GetAudioFeatures(It.IsAny())); + spotifyMock.Verify(m => m.GetAudioFeatures(It.IsAny(), It.IsAny())); spotifyMock.VerifyNoOtherCalls(); timelineMock.Verify(m => m.Add(It.IsAny(), It.IsAny()), Times.Once); diff --git a/Selector.Tests/Selector.Tests.csproj b/Selector.Tests/Selector.Tests.csproj index b4c59d4..2073ea3 100644 --- a/Selector.Tests/Selector.Tests.csproj +++ b/Selector.Tests/Selector.Tests.csproj @@ -9,8 +9,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Selector.Tests/Watcher/PlayerWatcher.cs b/Selector.Tests/Watcher/PlayerWatcher.cs index 9a4ed7b..25df0fe 100644 --- a/Selector.Tests/Watcher/PlayerWatcher.cs +++ b/Selector.Tests/Watcher/PlayerWatcher.cs @@ -33,7 +33,7 @@ namespace Selector.Tests var spotMock = new Mock(); var eq = new UriEqual(); - spotMock.Setup(s => s.GetCurrentPlayback().Result).Returns(playingQueue.Dequeue); + spotMock.Setup(s => s.GetCurrentPlayback(It.IsAny()).Result).Returns(playingQueue.Dequeue); var watcher = new PlayerWatcher(spotMock.Object, eq); @@ -190,7 +190,7 @@ namespace Selector.Tests var eq = new UriEqual(); spotMock.Setup( - s => s.GetCurrentPlayback().Result + s => s.GetCurrentPlayback(It.IsAny()).Result ).Returns(playingQueue.Dequeue); var watcher = new PlayerWatcher(spotMock.Object, eq); @@ -224,7 +224,7 @@ namespace Selector.Tests await Task.Delay(execTime); tokenSource.Cancel(); - spotMock.Verify(s => s.GetCurrentPlayback(), Times.Exactly(numberOfCalls)); + spotMock.Verify(s => s.GetCurrentPlayback(It.IsAny()), Times.Exactly(numberOfCalls)); } // [Fact] diff --git a/Selector.Tests/Watcher/PlaylistWatcher.cs b/Selector.Tests/Watcher/PlaylistWatcher.cs index cd0f91f..b17bd85 100644 --- a/Selector.Tests/Watcher/PlaylistWatcher.cs +++ b/Selector.Tests/Watcher/PlaylistWatcher.cs @@ -33,7 +33,7 @@ namespace Selector.Tests var spotMock = new Mock(); - spotMock.Setup(s => s.Playlists.Get(It.IsAny()).Result).Returns(playlistDequeue.Dequeue); + spotMock.Setup(s => s.Playlists.Get(It.IsAny(), It.IsAny()).Result).Returns(playlistDequeue.Dequeue); var config = new PlaylistWatcherConfig() { PlaylistId = "spotify:playlist:test" }; var watcher = new PlaylistWatcher(config, spotMock.Object); @@ -80,7 +80,7 @@ namespace Selector.Tests var spotMock = new Mock(); - spotMock.Setup(s => s.Playlists.Get(It.IsAny()).Result).Returns(playlistDequeue.Dequeue); + spotMock.Setup(s => s.Playlists.Get(It.IsAny(), It.IsAny()).Result).Returns(playlistDequeue.Dequeue); var config = new PlaylistWatcherConfig() { PlaylistId = "spotify:playlist:test" }; var watcher = new PlaylistWatcher(config, spotMock.Object); diff --git a/Selector.Web/Selector.Web.csproj b/Selector.Web/Selector.Web.csproj index 6546dc9..a9046a8 100644 --- a/Selector.Web/Selector.Web.csproj +++ b/Selector.Web/Selector.Web.csproj @@ -14,13 +14,13 @@ - - + + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -28,10 +28,10 @@ - - - - + + + + diff --git a/Selector/Selector.csproj b/Selector/Selector.csproj index 68490f2..dae204f 100644 --- a/Selector/Selector.csproj +++ b/Selector/Selector.csproj @@ -8,7 +8,7 @@ - +