diff --git a/README.md b/README.md index f6bd12f8f..14839a00d 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ The software implements the [Torznab](https://torznab.github.io/spec-1.3-draft/i A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett) #### Supported Systems -The currently supported version of Jackett is 0.23.+, which is compatible with the following OS: -* Windows 10 Version 1607+ or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#windows) -* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux) -* macOS 13.0+ (Ventura) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos) +The currently supported version of Jackett is 0.24.+, which is compatible with the following OS: +* Windows 10 Version 1607+ or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/10.0/supported-os.md#windows) +* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/10.0/supported-os.md#linux) +* macOS 14.0+ (Sonoma) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/10.0/supported-os.md#apple) Prior versions of Jackett are no longer supported. @@ -714,7 +714,7 @@ We recommend you install Jackett as a Windows service using the supplied [Window 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=net80#dependencies +1. Check if you need any .NET prerequisites installed, see https://learn.microsoft.com/en-us/dotnet/core/install/windows#net-installer 2. Download the latest version of the [Windows installer](https://github.com/Jackett/Jackett/releases/latest/download/Jackett.Installer.Windows.exe) 3. Run the Jackett.Installer.Windows.exe program. 4. When prompted if you would like this app to make changes to your computer, select "yes". @@ -938,8 +938,8 @@ git clone https://github.com/Jackett/Jackett.git cd Jackett/src # dotnet core version -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 +dotnet publish Jackett.Server -f net10.0 --self-contained -r osx-x64 -c Debug # takes care of everything +./Jackett.Server/bin/Debug/net10.0/osx-x64/jackett # run jackett ``` ### Linux @@ -951,8 +951,8 @@ git clone https://github.com/Jackett/Jackett.git cd Jackett/src # dotnet core version -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 +dotnet publish Jackett.Server -f net10.0 --self-contained -r linux-x64 -c Debug # takes care of everything +./Jackett.Server/bin/Debug/net10.0/linux-x64/jackett # run jackett ``` ## Screenshots diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1cf67038c..960ff07ce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,12 +2,12 @@ name: $(majorVersion).$(minorVersion).$(patchVersion) variables: majorVersion: 0 - minorVersion: 23 + minorVersion: 24 patchVersion: $[counter(variables['minorVersion'], 1)] # this will reset when we bump minor jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion) buildConfiguration: Release - netCoreFramework: net8.0 - netCoreSdkVersion: 8.0.x + netCoreFramework: net10.0 + netCoreSdkVersion: 10.0.x # system.debug: true trigger: @@ -124,6 +124,7 @@ stages: packageType: sdk version: $(netCoreSdkVersion) installationPath: $(Agent.ToolsDirectory)/dotnet + includePreviewVersions: true - task: DotNetCoreCLI@2 displayName: Build DateTimeRoutines @@ -341,6 +342,7 @@ stages: packageType: sdk version: $(netCoreSdkVersion) installationPath: $(Agent.ToolsDirectory)/dotnet + includePreviewVersions: true - task: DotNetCoreCLI@2 displayName: Install Dotnet Format @@ -451,6 +453,7 @@ stages: packageType: sdk version: $(netCoreSdkVersion) installationPath: $(Agent.ToolsDirectory)/dotnet + includePreviewVersions: true - task: DotNetCoreCLI@2 displayName: Unit Tests & Code Coverage @@ -499,7 +502,7 @@ stages: - task: PublishPipelineArtifact@1 condition: and(succeeded(), startsWith(variables['runtime'], 'win')) inputs: - targetPath: $(Build.SourcesDirectory)/coverlet/reports/coverage.cobertura.Windows.net8.0.xml + targetPath: $(Build.SourcesDirectory)/coverlet/reports/coverage.cobertura.Windows.net10.0.xml - stage: IntegrationTestJackett displayName: Integration Tests @@ -576,6 +579,7 @@ stages: packageType: sdk version: $(netCoreSdkVersion) installationPath: $(Agent.ToolsDirectory)/dotnet + includePreviewVersions: true - task: DotNetCoreCLI@2 displayName: Integration Tests diff --git a/src/Jackett.Common/Jackett.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj index f756456cb..f78181761 100644 --- a/src/Jackett.Common/Jackett.Common.csproj +++ b/src/Jackett.Common/Jackett.Common.csproj @@ -23,12 +23,12 @@ - + - - + + diff --git a/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj b/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj index 5959718e5..94c724d89 100644 --- a/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj +++ b/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net8.0;net471 + net10.0;net471 false false diff --git a/src/Jackett.Server/Jackett.Server.csproj b/src/Jackett.Server/Jackett.Server.csproj index 6198b265b..d119de5b1 100644 --- a/src/Jackett.Server/Jackett.Server.csproj +++ b/src/Jackett.Server/Jackett.Server.csproj @@ -2,7 +2,7 @@ $(MSBuildProjectName) - net8.0;net471 + net10.0;net471 jackett.ico Exe @@ -10,12 +10,12 @@ ISLINUXMUSL - + false - + false @@ -33,11 +33,11 @@ - - - - - + + + + + @@ -59,8 +59,8 @@ - - + + diff --git a/src/Jackett.Server/Startup.cs b/src/Jackett.Server/Startup.cs index 3af6d99e4..2967d2513 100644 --- a/src/Jackett.Server/Startup.cs +++ b/src/Jackett.Server/Startup.cs @@ -56,6 +56,7 @@ namespace Jackett.Server options.Cookie.Name = "Jackett"; }); +#if NET471 services.Configure(options => { // When adjusting these parameters make sure it's well tested with various environments @@ -66,7 +67,6 @@ namespace Jackett.Server options.KnownProxies.Clear(); }); -#if NET471 services.AddMvc( config => config.Filters.Add( new AuthorizeFilter( @@ -74,6 +74,15 @@ namespace Jackett.Server .AddJsonOptions(options => options.SerializerSettings.ContractResolver = new DefaultContractResolver()); //Web app uses Pascal Case JSON); #else + services.Configure(options => + { + // When adjusting these parameters make sure it's well tested with various environments + // See https://github.com/Jackett/Jackett/issues/3517 + options.ForwardLimit = 10; + options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost; + options.KnownIPNetworks.Clear(); + options.KnownProxies.Clear(); + }); services.AddControllers( config => config.Filters.Add( diff --git a/src/Jackett.Service/Jackett.Service.csproj b/src/Jackett.Service/Jackett.Service.csproj index eab1fd273..40bdf8e67 100644 --- a/src/Jackett.Service/Jackett.Service.csproj +++ b/src/Jackett.Service/Jackett.Service.csproj @@ -1,7 +1,7 @@ - net8.0-windows + net10.0-windows WinExe JackettService jackett.ico diff --git a/src/Jackett.Test/Jackett.Test.csproj b/src/Jackett.Test/Jackett.Test.csproj index a0e04a8fa..668de2370 100644 --- a/src/Jackett.Test/Jackett.Test.csproj +++ b/src/Jackett.Test/Jackett.Test.csproj @@ -1,7 +1,7 @@ - net8.0;net471 + net10.0;net471 false @@ -25,14 +25,14 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/src/Jackett.Tray/Jackett.Tray.csproj b/src/Jackett.Tray/Jackett.Tray.csproj index 8a8253e93..16a3cb083 100644 --- a/src/Jackett.Tray/Jackett.Tray.csproj +++ b/src/Jackett.Tray/Jackett.Tray.csproj @@ -1,7 +1,7 @@ - net8.0-windows + net10.0-windows WinExe true JackettTray diff --git a/src/Jackett.Updater/Jackett.Updater.csproj b/src/Jackett.Updater/Jackett.Updater.csproj index ffcc01452..3a6bc6631 100644 --- a/src/Jackett.Updater/Jackett.Updater.csproj +++ b/src/Jackett.Updater/Jackett.Updater.csproj @@ -1,7 +1,7 @@ - net8.0;net471 + net10.0;net471 jackett.ico JackettUpdater Exe