From 7ee84c703a8417b0227c6934464ece7b1ae1a2ff Mon Sep 17 00:00:00 2001 From: Uruk Date: Mon, 11 Mar 2024 16:44:54 +0100 Subject: [PATCH 1/3] Update .NET to 8.0 - Update .NET to 8.0 - Update .NETFramework to 4.8.1 - Update packages versions - Update MacOS to 12 since earlier version or not supported : https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md - OS-release update to Ubuntu 20.04 - Remove clock and change add to append - Fix task: NodeTool@0 to UseNode@1 - Fix task: reportgenerator@4 to reportgenerator@5 --- azure-pipelines.yml | 78 +++++++++---------- build.sh | 46 +++++------ docs.sh | 2 +- package.json | 2 +- src/Directory.Build.props | 12 +-- src/NzbDrone.Api.Test/Radarr.Api.Test.csproj | 2 +- .../Radarr.Automation.Test.csproj | 6 +- src/NzbDrone.Automation.Test/app.config | 2 +- .../Radarr.Common.Test.csproj | 2 +- .../EnvironmentInfo/RuntimeInfo.cs | 2 +- src/NzbDrone.Common/Radarr.Common.csproj | 22 +++--- src/NzbDrone.Console/Radarr.Console.csproj | 2 +- .../Radarr.Core.Test.csproj | 4 +- src/NzbDrone.Core/Radarr.Core.csproj | 22 +++--- .../Radarr.Host.Test.csproj | 2 +- src/NzbDrone.Host/Radarr.Host.csproj | 6 +- .../Radarr.Integration.Test.csproj | 4 +- .../Radarr.Libraries.Test.csproj | 2 +- src/NzbDrone.Libraries.Test/app.config | 2 +- .../ReleaseFileVersionAdapterFixture.cs | 4 +- .../Files/linux/lsb-release | 6 +- src/NzbDrone.Mono.Test/Files/linux/os-release | 6 +- .../Radarr.Mono.Test.csproj | 2 +- src/NzbDrone.Mono.Test/app.config | 2 +- src/NzbDrone.Mono/Radarr.Mono.csproj | 2 +- src/NzbDrone.SignalR/Radarr.SignalR.csproj | 2 +- src/NzbDrone.Test.Common/App.config | 2 +- src/NzbDrone.Test.Common/NzbDroneRunner.cs | 2 +- .../Radarr.Test.Common.csproj | 14 ++-- .../Radarr.Test.Dummy.csproj | 2 +- src/NzbDrone.Test.Dummy/app.config | 2 +- .../Radarr.Update.Test.csproj | 2 +- src/NzbDrone.Update/Radarr.Update.csproj | 4 +- src/NzbDrone.Update/app.config | 2 +- .../Radarr.Windows.Test.csproj | 2 +- src/NzbDrone.Windows.Test/app.config | 2 +- src/NzbDrone.Windows/Radarr.Windows.csproj | 4 +- src/NzbDrone/Radarr.csproj | 4 +- src/Radarr.Api.V3/Radarr.Api.V3.csproj | 6 +- .../ApiKeyAuthenticationHandler.cs | 3 +- .../BasicAuthenticationHandler.cs | 8 +- .../Authentication/NoAuthenticationHandler.cs | 5 +- .../Middleware/VersionMiddleware.cs | 2 +- src/Radarr.Http/Radarr.Http.csproj | 8 +- .../ServiceInstall/ServiceInstall.csproj | 2 +- src/ServiceHelpers/ServiceInstall/app.config | 2 +- .../ServiceUninstall/ServiceUninstall.csproj | 2 +- .../ServiceUninstall/app.config | 2 +- src/coverlet.runsettings | 2 +- yarn.lock | 38 +++++---- 50 files changed, 185 insertions(+), 181 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 60730a168..bb2c6a574 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,12 +15,12 @@ variables: buildName: '$(Build.SourceBranchName).$(radarrVersion)' sentryOrg: 'servarr' sentryUrl: 'https://sentry.servarr.com' - dotnetVersion: '6.0.417' + dotnetVersion: '8.0.201' nodeVersion: '20.X' innoVersion: '6.2.2' windowsImage: 'windows-2022' linuxImage: 'ubuntu-20.04' - macImage: 'macOS-11' + macImage: 'macOS-12' trigger: branches: @@ -96,7 +96,7 @@ stages: submodules: true fetchDepth: 1 - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - bash: | @@ -122,27 +122,27 @@ stages: artifact: '$(osName)Backend' displayName: Publish Backend condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net6.0/win-x64/publish' + - publish: '$(testsFolder)/net8.0/win-x64/publish' artifact: win-x64-tests displayName: Publish win-x64 Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net6.0/linux-x64/publish' + - publish: '$(testsFolder)/net8.0/linux-x64/publish' artifact: linux-x64-tests displayName: Publish linux-x64 Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net6.0/linux-x86/publish' + - publish: '$(testsFolder)/net8.0/linux-x86/publish' artifact: linux-x86-tests displayName: Publish linux-x86 Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish' + - publish: '$(testsFolder)/net8.0/linux-musl-x64/publish' artifact: linux-musl-x64-tests displayName: Publish linux-musl-x64 Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net6.0/freebsd-x64/publish' + - publish: '$(testsFolder)/net8.0/freebsd-x64/publish' artifact: freebsd-x64-tests displayName: Publish freebsd-x64 Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net6.0/osx-x64/publish' + - publish: '$(testsFolder)/net8.0/osx-x64/publish' artifact: osx-x64-tests displayName: Publish osx-x64 Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) @@ -166,10 +166,10 @@ stages: pool: vmImage: $(imageName) steps: - - task: NodeTool@0 + - task: UseNode@1 displayName: Set Node.js version inputs: - versionSpec: $(nodeVersion) + version: $(nodeVersion) - checkout: self submodules: true fetchDepth: 1 @@ -260,21 +260,21 @@ stages: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/win-x64/net6.0 + rootFolderOrFile: $(artifactsFolder)/win-x64/net8.0 - task: ArchiveFiles@2 displayName: Create win-x86 zip inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x86.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/win-x86/net6.0 + rootFolderOrFile: $(artifactsFolder)/win-x86/net8.0 - task: ArchiveFiles@2 displayName: Create osx-x64 app inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-app-core-x64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/osx-x64-app/net6.0 + rootFolderOrFile: $(artifactsFolder)/osx-x64-app/net8.0 - task: ArchiveFiles@2 displayName: Create osx-x64 tar inputs: @@ -282,14 +282,14 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/osx-x64/net6.0 + rootFolderOrFile: $(artifactsFolder)/osx-x64/net8.0 - task: ArchiveFiles@2 displayName: Create osx-arm64 app inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-app-core-arm64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/osx-arm64-app/net6.0 + rootFolderOrFile: $(artifactsFolder)/osx-arm64-app/net8.0 - task: ArchiveFiles@2 displayName: Create osx-arm64 tar inputs: @@ -297,7 +297,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/osx-arm64/net6.0 + rootFolderOrFile: $(artifactsFolder)/osx-arm64/net8.0 - task: ArchiveFiles@2 displayName: Create linux-x64 tar inputs: @@ -305,7 +305,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-x64/net6.0 + rootFolderOrFile: $(artifactsFolder)/linux-x64/net8.0 - task: ArchiveFiles@2 displayName: Create linux-musl-x64 tar inputs: @@ -313,7 +313,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net6.0 + rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net8.0 - task: ArchiveFiles@2 displayName: Create linux-x86 tar inputs: @@ -321,7 +321,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-x86/net6.0 + rootFolderOrFile: $(artifactsFolder)/linux-x86/net8.0 - task: ArchiveFiles@2 displayName: Create linux-arm tar inputs: @@ -329,7 +329,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0 + rootFolderOrFile: $(artifactsFolder)/linux-arm/net8.0 - task: ArchiveFiles@2 displayName: Create linux-musl-arm tar inputs: @@ -337,7 +337,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-musl-arm/net6.0 + rootFolderOrFile: $(artifactsFolder)/linux-musl-arm/net8.0 - task: ArchiveFiles@2 displayName: Create linux-arm64 tar inputs: @@ -345,7 +345,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-arm64/net6.0 + rootFolderOrFile: $(artifactsFolder)/linux-arm64/net8.0 - task: ArchiveFiles@2 displayName: Create linux-musl-arm64 tar inputs: @@ -353,7 +353,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0 + rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net8.0 - task: ArchiveFiles@2 displayName: Create freebsd-x64 tar inputs: @@ -361,7 +361,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net6.0 + rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net8.0 - publish: $(Build.ArtifactStagingDirectory) artifact: 'Packages' displayName: Publish Packages @@ -448,7 +448,7 @@ stages: steps: - checkout: none - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) condition: ne(variables['poolName'], 'FreeBSD') @@ -560,7 +560,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: none @@ -616,7 +616,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: none @@ -698,7 +698,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: none @@ -752,7 +752,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: none @@ -815,7 +815,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: none @@ -1008,7 +1008,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: none @@ -1089,10 +1089,10 @@ stages: pool: vmImage: $(imageName) steps: - - task: NodeTool@0 + - task: UseNode@1 displayName: Set Node.js version inputs: - versionSpec: $(nodeVersion) + version: $(nodeVersion) - checkout: self submodules: true fetchDepth: 1 @@ -1145,7 +1145,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: self @@ -1198,7 +1198,7 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core' + displayName: 'Install .NET core' inputs: version: $(dotnetVersion) - checkout: self # Need history for Sonar analysis @@ -1220,13 +1220,13 @@ stages: sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml - bash: | - ./build.sh --backend -f net6.0 -r win-x64 - TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage + ./build.sh --backend -f net8.0 -r win-x64 + TEST_DIR=_tests/net8.0/win-x64/publish/ ./test.sh Windows Unit Coverage displayName: Coverage Unit Tests - task: SonarCloudAnalyze@1 condition: eq(variables['System.PullRequest.IsFork'], 'False') displayName: Publish SonarCloud Results - - task: reportgenerator@4 + - task: reportgenerator@5 displayName: Generate Coverage Report inputs: reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml' diff --git a/build.sh b/build.sh index 2cb5facae..e792ed810 100755 --- a/build.sh +++ b/build.sh @@ -137,7 +137,7 @@ PackageLinux() echo "Adding Radarr.Mono to UpdatePackage" cp $folder/Radarr.Mono.* $folder/Radarr.Update - if [ "$framework" = "net6.0" ]; then + if [ "$framework" = "net8.0" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update cp $folder/libMonoPosixHelper.* $folder/Radarr.Update fi @@ -165,7 +165,7 @@ PackageMacOS() echo "Adding Radarr.Mono to UpdatePackage" cp $folder/Radarr.Mono.* $folder/Radarr.Update - if [ "$framework" = "net6.0" ]; then + if [ "$framework" = "net8.0" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update cp $folder/libMonoPosixHelper.* $folder/Radarr.Update fi @@ -377,15 +377,15 @@ then Build if [[ -z "$RID" || -z "$FRAMEWORK" ]]; then - PackageTests "net6.0" "win-x64" - PackageTests "net6.0" "win-x86" - PackageTests "net6.0" "linux-x64" - PackageTests "net6.0" "linux-musl-x64" - PackageTests "net6.0" "osx-x64" + PackageTests "net8.0" "win-x64" + PackageTests "net8.0" "win-x86" + PackageTests "net8.0" "linux-x64" + PackageTests "net8.0" "linux-musl-x64" + PackageTests "net8.0" "osx-x64" if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ]; then - PackageTests "net6.0" "freebsd-x64" - PackageTests "net6.0" "linux-x86" + PackageTests "net8.0" "freebsd-x64" + PackageTests "net8.0" "linux-x86" fi else PackageTests "$FRAMEWORK" "$RID" @@ -413,20 +413,20 @@ then if [[ -z "$RID" || -z "$FRAMEWORK" ]]; then - Package "net6.0" "win-x64" - Package "net6.0" "win-x86" - Package "net6.0" "linux-x64" - Package "net6.0" "linux-musl-x64" - Package "net6.0" "linux-arm64" - Package "net6.0" "linux-musl-arm64" - Package "net6.0" "linux-arm" - Package "net6.0" "linux-musl-arm" - Package "net6.0" "osx-x64" - Package "net6.0" "osx-arm64" + Package "net8.0" "win-x64" + Package "net8.0" "win-x86" + Package "net8.0" "linux-x64" + Package "net8.0" "linux-musl-x64" + Package "net8.0" "linux-arm64" + Package "net8.0" "linux-musl-arm64" + Package "net8.0" "linux-arm" + Package "net8.0" "linux-musl-arm" + Package "net8.0" "osx-x64" + Package "net8.0" "osx-arm64" if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ]; then - Package "net6.0" "freebsd-x64" - Package "net6.0" "linux-x86" + Package "net8.0" "freebsd-x64" + Package "net8.0" "linux-x86" fi else Package "$FRAMEWORK" "$RID" @@ -436,7 +436,7 @@ fi if [ "$INSTALLER" = "YES" ]; then InstallInno - BuildInstaller "net6.0" "win-x64" - BuildInstaller "net6.0" "win-x86" + BuildInstaller "net8.0" "win-x64" + BuildInstaller "net8.0" "win-x86" RemoveInno fi diff --git a/docs.sh b/docs.sh index 606af8e9e..593412d8f 100644 --- a/docs.sh +++ b/docs.sh @@ -29,7 +29,7 @@ dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p dotnet new tool-manifest dotnet tool install --version 6.5.0 Swashbuckle.AspNetCore.Cli -dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/radarr.console.dll" v3 & +dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net8.0/$RUNTIME/radarr.console.dll" v3 & sleep 45 diff --git a/package.json b/package.json index 9f8deaf9e..f29493ade 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,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.25", + "@microsoft/signalr": "8.0.0", "@sentry/browser": "7.51.2", "@sentry/integrations": "7.51.2", "@types/node": "18.16.8", diff --git a/src/Directory.Build.props b/src/Directory.Build.props index aec1e1b3b..a64e57439 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - 6.0-all + 8.0-all true true false @@ -101,14 +101,14 @@ - - + + - + - - + + diff --git a/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj index 9bfecde2c..555287131 100644 --- a/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj index 8e8212080..af6172c29 100644 --- a/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj @@ -1,10 +1,10 @@  - net6.0 + net8.0 - - + + diff --git a/src/NzbDrone.Automation.Test/app.config b/src/NzbDrone.Automation.Test/app.config index 85da475f2..a6d0b59f0 100644 --- a/src/NzbDrone.Automation.Test/app.config +++ b/src/NzbDrone.Automation.Test/app.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj index 3726a01c7..054797a9f 100644 --- a/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs index 93284e477..3248c250a 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 Radarr.dll for entry assembly, we need the actual + // net8.0 will return Radarr.dll for entry assembly, we need the actual // executable name (Radarr 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/Radarr.Common.csproj b/src/NzbDrone.Common/Radarr.Common.csproj index ff6f3be23..10e8bbfed 100644 --- a/src/NzbDrone.Common/Radarr.Common.csproj +++ b/src/NzbDrone.Common/Radarr.Common.csproj @@ -1,26 +1,26 @@  - net6.0 + net8.0 ISMUSL - - + + - - - - + + + + - - + + - + - + diff --git a/src/NzbDrone.Console/Radarr.Console.csproj b/src/NzbDrone.Console/Radarr.Console.csproj index 8e5a92e07..8ede30c64 100644 --- a/src/NzbDrone.Console/Radarr.Console.csproj +++ b/src/NzbDrone.Console/Radarr.Console.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + net8.0 ..\NzbDrone.Host\Radarr.ico diff --git a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj index f816fc81b..96fef1367 100644 --- a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj @@ -1,9 +1,9 @@  - net6.0 + net8.0 - + diff --git a/src/NzbDrone.Core/Radarr.Core.csproj b/src/NzbDrone.Core/Radarr.Core.csproj index ebfd03e37..88acd42e0 100644 --- a/src/NzbDrone.Core/Radarr.Core.csproj +++ b/src/NzbDrone.Core/Radarr.Core.csproj @@ -1,31 +1,31 @@  - net6.0 + net8.0 - + - - + + - - - - + + + + - + - + - + diff --git a/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj index 23c9f2249..ee5cb6f05 100644 --- a/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 diff --git a/src/NzbDrone.Host/Radarr.Host.csproj b/src/NzbDrone.Host/Radarr.Host.csproj index 3de6409e6..f12f4e6b9 100644 --- a/src/NzbDrone.Host/Radarr.Host.csproj +++ b/src/NzbDrone.Host/Radarr.Host.csproj @@ -1,11 +1,11 @@  - net6.0 + net8.0 Library - - + + diff --git a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj index 8dd232d28..19deed0f7 100644 --- a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj @@ -1,10 +1,10 @@  - net6.0 + net8.0 Library - + diff --git a/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj index e62c371b8..467027084 100644 --- a/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Radarr.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 85da475f2..a6d0b59f0 100644 --- a/src/NzbDrone.Libraries.Test/app.config +++ b/src/NzbDrone.Libraries.Test/app.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs b/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs index 496f4eefa..dbf4fc510 100644 --- a/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs +++ b/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs @@ -76,8 +76,8 @@ namespace NzbDrone.Mono.Test.EnvironmentInfo.VersionAdapters var version = Subject.Read(); version.Should().NotBeNull(); version.Name.Should().Be("ubuntu"); - version.Version.Should().Be("14.04"); - version.FullName.Should().Be("Ubuntu 14.04.5 LTS"); + version.Version.Should().Be("20.04"); + version.FullName.Should().Be("Ubuntu 20.04.6 LTS"); } } } diff --git a/src/NzbDrone.Mono.Test/Files/linux/lsb-release b/src/NzbDrone.Mono.Test/Files/linux/lsb-release index 55eb268d5..8f4a95f7d 100644 --- a/src/NzbDrone.Mono.Test/Files/linux/lsb-release +++ b/src/NzbDrone.Mono.Test/Files/linux/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=Ubuntu -DISTRIB_RELEASE=14.04 -DISTRIB_CODENAME=trusty -DISTRIB_DESCRIPTION="Ubuntu 14.04.5 LTS" \ No newline at end of file +DISTRIB_RELEASE=20.04 +DISTRIB_CODENAME=focal +DISTRIB_DESCRIPTION="Ubuntu 20.04.6 LTS" \ No newline at end of file diff --git a/src/NzbDrone.Mono.Test/Files/linux/os-release b/src/NzbDrone.Mono.Test/Files/linux/os-release index 724f6a79f..43710f71d 100644 --- a/src/NzbDrone.Mono.Test/Files/linux/os-release +++ b/src/NzbDrone.Mono.Test/Files/linux/os-release @@ -1,9 +1,9 @@ NAME="Ubuntu" -VERSION="14.04.5 LTS, Trusty Tahr" +VERSION="20.04.6 LTS, Focal Fossa" ID=ubuntu ID_LIKE=debian -PRETTY_NAME="Ubuntu 14.04.5 LTS" -VERSION_ID="14.04" +PRETTY_NAME="Ubuntu 20.04.6 LTS" +VERSION_ID="20.04" HOME_URL="http://www.ubuntu.com/" SUPPORT_URL="http://help.ubuntu.com/" BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/" \ No newline at end of file diff --git a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj index 9bfb6f830..dbc5cb1e7 100644 --- a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0