Upgrades nuget packages. Removes deprecated packages. Fixes build warnings.

src/Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.MusicBrainz/MusicBrainzApi.cs

@@ -1,41 +1,41 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Hqub.MusicBrainz.API;
 using Hqub.MusicBrainz.API.Entities;
-using Hqub.MusicBrainz.API.Entities.Collections;
 using Newtonsoft.Json;
 using Ombi.Api.MusicBrainz.Models;
 
 namespace Ombi.Api.MusicBrainz
 {
     public class MusicBrainzApi : IMusicBrainzApi
     {
+        private readonly MusicBrainzClient _client;
         private readonly IApi _api;
 
-        public MusicBrainzApi(IApi api)
+        public MusicBrainzApi(MusicBrainzClient client, IApi api)
         {
+            _client = client;
             _api = api;
         }
 
         public Task<Release> GetAlbumInformation(string albumId)
         {
-            var album = Release.GetAsync(albumId);
+            var album = _client.Releases.GetAsync(albumId);
             return album;
         }
 
         public async Task<IEnumerable<Artist>> SearchArtist(string artistQuery)
         {
-            var artist = await Artist.SearchAsync(artistQuery, 10);
+            var artist = await _client.Artists.SearchAsync(artistQuery, 10);
             return artist.Items.Where(x => x.Type != null);
         }
 
         public async Task<Artist> GetArtistInformation(string artistId)
         {
-            var artist = await Artist.GetAsync(artistId, "artist-rels", "url-rels", "releases", "release-groups");
+            var artist = await _client.Artists.GetAsync(artistId, "artist-rels", "url-rels", "releases", "release-groups");
             return artist;
         }
 
@@ -49,8 +49,7 @@ public async Task<IEnumerable<Release>> GetReleaseForArtist(string artistId)
             };
 
             // Search for a release by title.
-            var releases = await Release.SearchAsync(query);
-
+            var releases = await _client.Releases.SearchAsync(query);
             return releases.Items;
         }
 
@@ -65,10 +64,5 @@ public async Task<ReleaseGroupArt> GetCoverArtForReleaseGroup(string musicBrainz
             }
             return null;
         }
-
-        private void AddHeaders(Request req)
-        {
-            req.AddHeader("Accept", "application/json");
-        }
     }
 }

src/Ombi.Api.MusicBrainz/Ombi.Api.MusicBrainz.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MusicBrainzAPI" Version="2.0.1" />
+    <PackageReference Include="MusicBrainzAPI" Version="2.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.Notifications/Ombi.Api.Notifications.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Humanizer.Core" Version="2.4.2" />
+    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.Twilio/Ombi.Api.Twilio.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Twilio" Version="5.37.2" />
+    <PackageReference Include="Twilio" Version="5.80.1" />
   </ItemGroup>
 
 </Project>

src/Ombi.Api/Ombi.Api.csproj

@@ -12,9 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Polly" Version="7.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Core.Tests/Engine/MovieRequestEngineTests.cs

@@ -2,7 +2,6 @@
 using Moq;
 using Moq.AutoMock;
 using NUnit.Framework;
-using Ombi.Core.Authentication;
 using Ombi.Core.Engine;
 using Ombi.Core.Helpers;
 using Ombi.Core.Models.Requests;
@@ -52,7 +51,7 @@ public void Setup()
 
             _subject = _mocker.CreateInstance<MovieRequestEngine>();
             var list = DbHelper.GetQueryableMockDbSet(new RequestSubscription());
-            _mocker.Setup<IRepository<RequestSubscription>, IQueryable<RequestSubscription>>(x => x.GetAll()).Returns(new List<RequestSubscription>().AsQueryable().BuildMock().Object);
+            _mocker.Setup<IRepository<RequestSubscription>, IQueryable<RequestSubscription>>(x => x.GetAll()).Returns(new List<RequestSubscription>().AsQueryable().BuildMock());
         }
 
         [Test]

src/Ombi.Core.Tests/Engine/MovieRequestLimitsTests.cs

@@ -3,7 +3,6 @@
 using Moq.AutoMock;
 using NUnit.Framework;
 using Ombi.Core.Authentication;
-using Ombi.Core.Engine;
 using Ombi.Core.Helpers;
 using Ombi.Core.Models;
 using Ombi.Core.Services;
@@ -64,7 +63,7 @@ public async Task No_UserPassedIn_UsernotExist_No_MovieLimit_Set()
             var user = new OmbiUser();
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
 
 
 
@@ -82,7 +81,7 @@ public async Task No_UserPassedIn_No_MovieLimit_Set()
             };
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
 
 
 
@@ -100,7 +99,7 @@ public async Task UserPassedIn_MovieLimit_Set_No_Requests()
                 MovieRequestLimit = 1
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -131,7 +130,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit()
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -206,7 +205,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_MultipleRequests()
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -239,7 +238,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Daily_NoRequestsToday()
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -272,7 +271,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Daily_OneRequestsToday()
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -311,7 +310,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Daily_AllRequestsToday()
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -344,7 +343,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Weekly_NoRequests()
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -376,7 +375,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Weekly_OneRequestsWeek()
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -415,7 +414,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Weekly_AllRequestsWeek()
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -448,7 +447,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Monthly_NoRequests()
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -481,7 +480,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Monthly_OneRequests()
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -521,7 +520,7 @@ public async Task UserPassedIn_MovieLimit_Set_Limit_Monthly_AllRequests()
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
 
             var result = await _subject.GetRemainingMovieRequests(user, today);