diff --git a/.github/actions/package/package.sh b/.github/actions/package/package.sh index 8dce60585..4c3c8a8ba 100755 --- a/.github/actions/package/package.sh +++ b/.github/actions/package/package.sh @@ -3,7 +3,7 @@ outputFolder=_output artifactsFolder=_artifacts uiFolder="$outputFolder/UI" -framework="${FRAMEWORK:=net6.0}" +framework="${FRAMEWORK:=net8.0}" rm -rf $artifactsFolder mkdir $artifactsFolder diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd0f3ffe4..cc1728603 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ concurrency: cancel-in-progress: true env: - FRAMEWORK: net6.0 + FRAMEWORK: net8.0 RAW_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} SONARR_MAJOR_VERSION: 4 VERSION: 4.0.4 diff --git a/build.sh b/build.sh index ee59d2f61..44e86f8f2 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ set -e outputFolder='_output' testPackageFolder='_tests' artifactsFolder="_artifacts"; -framework="${FRAMEWORK:=net6.0}" +framework="${FRAMEWORK:=net8.0}" ProgressStart() { diff --git a/distribution/debian/install.sh b/distribution/debian/install.sh index 87a0b0914..303b56702 100644 --- a/distribution/debian/install.sh +++ b/distribution/debian/install.sh @@ -1,4 +1,5 @@ #!/bin/bash + ### Description: Sonarr .NET Debian install ### Originally written for Radarr by: DoctorArr - doctorarr@the-rowlands.co.uk on 2021-10-01 v1.0 ### Updates for servarr suite made by Bakerboy448, DoctorArr, brightghost, aeramor and VP-EN diff --git a/distribution/windows/setup/build.bat b/distribution/windows/setup/build.bat index 6c205089e..0d6b89d23 100644 --- a/distribution/windows/setup/build.bat +++ b/distribution/windows/setup/build.bat @@ -1,7 +1,7 @@ @REM SET SONARR_MAJOR_VERSION=4 @REM SET SONARR_VERSION=4.0.0.5 @REM SET BRANCH=develop -@REM SET FRAMEWORK=net6.0 +@REM SET FRAMEWORK=net8.0 @REM SET RUNTIME=win-x64 inno\ISCC.exe sonarr.iss diff --git a/docs.sh b/docs.sh index a0f21c41a..91533eed7 100755 --- a/docs.sh +++ b/docs.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -FRAMEWORK="net6.0" +FRAMEWORK="net8.0" PLATFORM=$1 if [ "$PLATFORM" = "Windows" ]; then diff --git a/global.json b/global.json index 5f5ece165..e72335a83 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.405" + "version": "8.0.201" } } diff --git a/package.json b/package.json index 05bac8b34..d29ffb68c 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@fortawesome/free-solid-svg-icons": "6.4.0", "@fortawesome/react-fontawesome": "0.2.0", "@juggle/resize-observer": "3.4.0", - "@microsoft/signalr": "6.0.21", + "@microsoft/signalr": "8.0.0", "@sentry/browser": "7.100.0", "@types/node": "18.16.8", "@types/react": "18.2.6", diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 239a98d73..6e6430173 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - 6.0-all + 8.0-all true true false @@ -98,13 +98,6 @@ $(MSBuildProjectName.Replace('Sonarr','NzbDrone')) - - - - - - - @@ -129,14 +122,14 @@ - - - - + + + + - - + + diff --git a/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj index 053b42cc9..a376886f6 100644 --- a/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj index 9cf833789..73483a610 100644 --- a/src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj @@ -1,11 +1,11 @@  - net6.0 + net8.0 - - + + diff --git a/src/NzbDrone.Automation.Test/app.config b/src/NzbDrone.Automation.Test/app.config index d660afa84..8da9b15e4 100644 --- a/src/NzbDrone.Automation.Test/app.config +++ b/src/NzbDrone.Automation.Test/app.config @@ -3,6 +3,6 @@ - + diff --git a/src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj index 402cae2bf..1a553cf8e 100644 --- a/src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/src/NzbDrone.Common/Disk/DestinationAlreadyExistsException.cs b/src/NzbDrone.Common/Disk/DestinationAlreadyExistsException.cs index ffdc36e0e..d96bb22e9 100644 --- a/src/NzbDrone.Common/Disk/DestinationAlreadyExistsException.cs +++ b/src/NzbDrone.Common/Disk/DestinationAlreadyExistsException.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Runtime.Serialization; namespace NzbDrone.Common.Disk { @@ -24,10 +23,5 @@ namespace NzbDrone.Common.Disk : base(message, innerException) { } - - protected DestinationAlreadyExistsException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } } } diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs index daa2cc449..f0231cb2c 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Common.EnvironmentInfo IsWindowsService = hostLifetime is WindowsServiceLifetime; IsStarting = true; - // net6.0 will return Sonarr.dll for entry assembly, we need the actual + // net8.0 will return Sonarr.dll for entry assembly, we need the actual // executable name (Sonarr on linux). On mono this will return the location of // the mono executable itself, which is not what we want. var entry = Process.GetCurrentProcess().MainModule; diff --git a/src/NzbDrone.Common/Sonarr.Common.csproj b/src/NzbDrone.Common/Sonarr.Common.csproj index afd914994..5ea3d3da9 100644 --- a/src/NzbDrone.Common/Sonarr.Common.csproj +++ b/src/NzbDrone.Common/Sonarr.Common.csproj @@ -1,25 +1,25 @@  - net6.0 + net8.0 ISMUSL - - + + - - - - + + + + - + - + - + diff --git a/src/NzbDrone.Console/Sonarr.Console.csproj b/src/NzbDrone.Console/Sonarr.Console.csproj index aef81527d..c383c33be 100644 --- a/src/NzbDrone.Console/Sonarr.Console.csproj +++ b/src/NzbDrone.Console/Sonarr.Console.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + net8.0 ..\NzbDrone.Host\Sonarr.ico diff --git a/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj index 6a1477da4..91d89a8a0 100644 --- a/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj @@ -1,9 +1,9 @@  - net6.0 + net8.0 - + diff --git a/src/NzbDrone.Core/Sonarr.Core.csproj b/src/NzbDrone.Core/Sonarr.Core.csproj index 269005cfb..c693aaf45 100644 --- a/src/NzbDrone.Core/Sonarr.Core.csproj +++ b/src/NzbDrone.Core/Sonarr.Core.csproj @@ -1,30 +1,30 @@  - net6.0 + net8.0 - + - - + + - - - + + + - + - + - - + + diff --git a/src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj index 00783be18..e62f81ff1 100644 --- a/src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/src/NzbDrone.Host/Sonarr.Host.csproj b/src/NzbDrone.Host/Sonarr.Host.csproj index 0ccf5c4a2..a0492b532 100644 --- a/src/NzbDrone.Host/Sonarr.Host.csproj +++ b/src/NzbDrone.Host/Sonarr.Host.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 Library - - + + - - + + diff --git a/src/NzbDrone.Integration.Test/Sonarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Sonarr.Integration.Test.csproj index b78253880..1ab50a049 100644 --- a/src/NzbDrone.Integration.Test/Sonarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Sonarr.Integration.Test.csproj @@ -1,11 +1,11 @@  - net6.0 + net8.0 Library - + diff --git a/src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj index 511c54cba..b2f6c3002 100644 --- a/src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/src/NzbDrone.Libraries.Test/app.config b/src/NzbDrone.Libraries.Test/app.config index d660afa84..8da9b15e4 100644 --- a/src/NzbDrone.Libraries.Test/app.config +++ b/src/NzbDrone.Libraries.Test/app.config @@ -3,6 +3,6 @@ - + diff --git a/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj index 60c6f901c..6f067e499 100644 --- a/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0