From dc58f078112defa49c5e418743b68467ee45d651 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sun, 25 Feb 2024 02:16:20 +0200 Subject: [PATCH] Bump to dotnet 8.0 --- README.md | 12 +++++----- azure-pipelines.yml | 8 +++---- src/Jackett.Common/Jackett.Common.csproj | 8 +++---- .../Jackett.IntegrationTests.csproj | 2 +- .../Controllers/ResultsController.cs | 2 +- src/Jackett.Server/Jackett.Server.csproj | 22 +++++++++---------- src/Jackett.Service/Jackett.Service.csproj | 2 +- src/Jackett.Test/Jackett.Test.csproj | 6 ++--- .../Server/Services/RuntimeSettingsTests.cs | 8 +++++-- src/Jackett.Tray/Jackett.Tray.csproj | 2 +- src/Jackett.Updater/Jackett.Updater.csproj | 2 +- 11 files changed, 39 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 09fda8533..6c38fc496 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht #### Supported Systems * Windows 7 SP1 or greater -* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux) +* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux) * macOS 10.15+ or greater
Supported Public Trackers @@ -725,7 +725,7 @@ We recommend you install Jackett as a Windows service using the supplied install To get started with using the installer for Jackett, follow the steps below: -1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#dependencies +1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net80#dependencies 2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page. 3. When prompted if you would like this app to make changes to your computer, select "yes". 4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled. @@ -940,8 +940,8 @@ git clone https://github.com/Jackett/Jackett.git cd Jackett/src # dotnet core version -dotnet publish Jackett.Server -f net6.0 --self-contained -r osx-x64 -c Debug # takes care of everything -./Jackett.Server/bin/Debug/net6.0/osx-x64/jackett # run jackett +dotnet publish Jackett.Server -f net8.0 --self-contained -r osx-x64 -c Debug # takes care of everything +./Jackett.Server/bin/Debug/net8.0/osx-x64/jackett # run jackett ``` ### Linux @@ -953,8 +953,8 @@ git clone https://github.com/Jackett/Jackett.git cd Jackett/src # dotnet core version -dotnet publish Jackett.Server -f net6.0 --self-contained -r linux-x64 -c Debug # takes care of everything -./Jackett.Server/bin/Debug/net6.0/linux-x64/jackett # run jackett +dotnet publish Jackett.Server -f net8.0 --self-contained -r linux-x64 -c Debug # takes care of everything +./Jackett.Server/bin/Debug/net8.0/linux-x64/jackett # run jackett ``` ## Screenshots diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b6006817..45b7909bc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,12 +2,12 @@ name: $(majorVersion).$(minorVersion).$(patchVersion) variables: majorVersion: 0 - minorVersion: 21 + minorVersion: 22 patchVersion: $[counter(variables['minorVersion'], 1)] # this will reset when we bump minor jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion) buildConfiguration: Release - netCoreFramework: net6.0 - netCoreSdkVersion: 6.0.x + netCoreFramework: net8.0 + netCoreSdkVersion: 8.0.x # system.debug: true trigger: @@ -117,7 +117,7 @@ stages: displayName: Build DateTimeRoutines # this task is not mandatory since DateTimeRoutines is build in the next task, but the purpose is to fix: # error MSB4018: System.IO.IOException: The process cannot access the file - # '/home/vsts/work/1/net6.0-linux-musl-arm/src/DateTimeRoutines/bin/Release/netstandard2.0/DateTimeRoutines.deps.json' + # '/home/vsts/work/1/src/DateTimeRoutines/bin/Release/netstandard2.0/DateTimeRoutines.deps.json' # because it is being used by another process. inputs: command: build diff --git a/src/Jackett.Common/Jackett.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj index 17ca0f2f9..604769590 100644 --- a/src/Jackett.Common/Jackett.Common.csproj +++ b/src/Jackett.Common/Jackett.Common.csproj @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj b/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj index 7b2806929..29b3b7333 100644 --- a/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj +++ b/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net6.0;net462 + net8.0;net462 false false diff --git a/src/Jackett.Server/Controllers/ResultsController.cs b/src/Jackett.Server/Controllers/ResultsController.cs index f48b5d76f..1147297fc 100644 --- a/src/Jackett.Server/Controllers/ResultsController.cs +++ b/src/Jackett.Server/Controllers/ResultsController.cs @@ -481,7 +481,7 @@ namespace Jackett.Server.Controllers if (retryAfter > 0) { - HttpContext.Response.Headers.Add("Retry-After", $"{retryAfter}"); + HttpContext.Response.Headers.Append("Retry-After", $"{retryAfter}"); } } diff --git a/src/Jackett.Server/Jackett.Server.csproj b/src/Jackett.Server/Jackett.Server.csproj index c2cedd3c0..3d2e466e2 100644 --- a/src/Jackett.Server/Jackett.Server.csproj +++ b/src/Jackett.Server/Jackett.Server.csproj @@ -2,7 +2,7 @@ $(MSBuildProjectName) - net6.0;net462 + net8.0;net462 jackett.ico Exe @@ -10,12 +10,12 @@ ISLINUXMUSL - + false - + false @@ -33,11 +33,11 @@ - - - - - + + + + + @@ -57,11 +57,11 @@ - + - - + + diff --git a/src/Jackett.Service/Jackett.Service.csproj b/src/Jackett.Service/Jackett.Service.csproj index 0737914d3..eab1fd273 100644 --- a/src/Jackett.Service/Jackett.Service.csproj +++ b/src/Jackett.Service/Jackett.Service.csproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows WinExe JackettService jackett.ico diff --git a/src/Jackett.Test/Jackett.Test.csproj b/src/Jackett.Test/Jackett.Test.csproj index ee57d40d4..9bf6d6f6f 100644 --- a/src/Jackett.Test/Jackett.Test.csproj +++ b/src/Jackett.Test/Jackett.Test.csproj @@ -1,7 +1,7 @@ - net6.0;net462 + net8.0;net462 false @@ -25,14 +25,14 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/src/Jackett.Test/Server/Services/RuntimeSettingsTests.cs b/src/Jackett.Test/Server/Services/RuntimeSettingsTests.cs index eee5dff29..dad322628 100644 --- a/src/Jackett.Test/Server/Services/RuntimeSettingsTests.cs +++ b/src/Jackett.Test/Server/Services/RuntimeSettingsTests.cs @@ -1,4 +1,5 @@ using System; +using System.Runtime.InteropServices; using Jackett.Common.Models.Config; using Jackett.Test.TestHelpers; using NUnit.Framework; @@ -14,9 +15,12 @@ namespace Jackett.Test.Server.Services var runtimeSettings = new RuntimeSettings(); var dataFolder = runtimeSettings.DataFolder; - if (System.Environment.OSVersion.Platform == PlatformID.Unix) + if (Environment.OSVersion.Platform == PlatformID.Unix) { - var expectedUnixPath = Environment.GetEnvironmentVariable("HOME") + "/.config/Jackett"; + var expectedUnixPath = Environment.GetEnvironmentVariable("HOME") + + (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) + ? "/Library/Application Support" + : "/.config") + "/Jackett"; Assert.AreEqual(expectedUnixPath, dataFolder); } else diff --git a/src/Jackett.Tray/Jackett.Tray.csproj b/src/Jackett.Tray/Jackett.Tray.csproj index cfd7acfd8..8a8253e93 100644 --- a/src/Jackett.Tray/Jackett.Tray.csproj +++ b/src/Jackett.Tray/Jackett.Tray.csproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows WinExe true JackettTray diff --git a/src/Jackett.Updater/Jackett.Updater.csproj b/src/Jackett.Updater/Jackett.Updater.csproj index 5000e750d..79a4474be 100644 --- a/src/Jackett.Updater/Jackett.Updater.csproj +++ b/src/Jackett.Updater/Jackett.Updater.csproj @@ -1,7 +1,7 @@ - net6.0;net462 + net8.0;net462 jackett.ico JackettUpdater Exe