diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 67b7a783e..7be680632 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ variables: buildName: '$(Build.SourceBranchName).$(readarrVersion)' sentryOrg: 'servarr' sentryUrl: 'https://sentry.servarr.com' - dotnetVersion: '6.0.300' + dotnetVersion: '6.0.302' innoVersion: '6.2.0' windowsImage: 'windows-2022' linuxImage: 'ubuntu-20.04' diff --git a/package.json b/package.json index 552bfc8d6..52ef394c4 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@fortawesome/free-regular-svg-icons": "5.15.3", "@fortawesome/free-solid-svg-icons": "5.15.3", "@fortawesome/react-fontawesome": "0.1.14", - "@microsoft/signalr": "6.0.5", + "@microsoft/signalr": "6.0.7", "@sentry/browser": "6.18.2", "@sentry/integrations": "6.18.2", "ansi-colors": "4.1.1", diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 784e3d89d..666d44da9 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -4,8 +4,8 @@ - - + + @@ -14,8 +14,8 @@ - - + + @@ -24,41 +24,40 @@ - + - + - + - + - + - - + + - + - + - - + \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs index 4c9e6851e..ac25c9702 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/yarn.lock b/yarn.lock index 4d6977ca7..b35d389ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1368,10 +1368,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== -"@microsoft/signalr@6.0.5": - version "6.0.5" - resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-6.0.5.tgz#219f7fa10e94a75a841d3d7140d939fd2c2657e9" - integrity sha512-Y6Mny+z71wv2/FiuoqLcraojQRIbyeF/Ao4y+tcZK28JzGGieoulXBJIVQhoxzeM15Xe8xGOX0/5pVlOpwrI8Q== +"@microsoft/signalr@6.0.7": + version "6.0.7" + resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-6.0.7.tgz#8651d6807a0430575ce51960c254deab8d682b4c" + integrity sha512-CoIz8K0IpaCGbI4rr2W8RHYA8Yq0KqY8DNsJzHw3UEWTJ3KqhWqeVCE8R24czzcsoUrE28xltEQ6qNTXZDHf3g== dependencies: abort-controller "^3.0.0" eventsource "^1.0.7"