diff --git a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
index 0485264e0..1cd62fe9e 100644
--- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
+++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
@@ -13,6 +13,6 @@
-
+
diff --git a/src/NzbDrone.Common/Lidarr.Common.csproj b/src/NzbDrone.Common/Lidarr.Common.csproj
index 676ee34a4..1294f5fbe 100644
--- a/src/NzbDrone.Common/Lidarr.Common.csproj
+++ b/src/NzbDrone.Common/Lidarr.Common.csproj
@@ -5,14 +5,14 @@
ISMUSL
-
+
-
+
-
+
diff --git a/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj
index 920858863..6e7bffb4d 100644
--- a/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj
@@ -4,7 +4,7 @@
-
+
diff --git a/src/NzbDrone.Core/Lidarr.Core.csproj b/src/NzbDrone.Core/Lidarr.Core.csproj
index 6910d162e..2fcf79c1b 100644
--- a/src/NzbDrone.Core/Lidarr.Core.csproj
+++ b/src/NzbDrone.Core/Lidarr.Core.csproj
@@ -17,13 +17,13 @@
-
+
-
+
-
+
-
+
diff --git a/src/NzbDrone.Host/Lidarr.Host.csproj b/src/NzbDrone.Host/Lidarr.Host.csproj
index dae13b4fc..71bdddbc1 100644
--- a/src/NzbDrone.Host/Lidarr.Host.csproj
+++ b/src/NzbDrone.Host/Lidarr.Host.csproj
@@ -6,9 +6,9 @@
-
-
-
+
+
+
diff --git a/src/NzbDrone.Mono/Lidarr.Mono.csproj b/src/NzbDrone.Mono/Lidarr.Mono.csproj
index d00036490..8c59b7ec9 100644
--- a/src/NzbDrone.Mono/Lidarr.Mono.csproj
+++ b/src/NzbDrone.Mono/Lidarr.Mono.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
index 8974296a5..a1eb60a46 100644
--- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
+++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
@@ -109,6 +109,11 @@ namespace NzbDrone.Test.Common.AutoMoq
return null;
}
+ if (serviceType == typeof(System.Text.Json.Serialization.JsonConverter))
+ {
+ return null;
+ }
+
// get the Mock object for the abstract class or interface
if (serviceType.IsInterface || serviceType.IsAbstract)
{
@@ -149,7 +154,7 @@ namespace NzbDrone.Test.Common.AutoMoq
private DelegateFactory GetMockFactory(Type serviceType)
{
var mockType = typeof(Mock<>).MakeGenericType(serviceType);
- return new DelegateFactory(r =>
+ return DelegateFactory.Of(r =>
{
var mock = (Mock)r.Resolve(mockType);
SetMock(serviceType, mock);
diff --git a/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj
index 9204094d7..56d7b19f6 100644
--- a/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj
@@ -8,11 +8,11 @@
-
+
-
-
+
+
diff --git a/src/NzbDrone.Update/Lidarr.Update.csproj b/src/NzbDrone.Update/Lidarr.Update.csproj
index 15f576b01..4425a843d 100644
--- a/src/NzbDrone.Update/Lidarr.Update.csproj
+++ b/src/NzbDrone.Update/Lidarr.Update.csproj
@@ -4,8 +4,8 @@
net6.0
-
-
+
+