diff --git a/README.md b/README.md index 67b7aceed..85a826755 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/master/release-notes/5.0/5.0-supported-os.md#linux) +* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux) * macOS 10.13 or greater
Supported Public Trackers @@ -647,7 +647,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=net50#dependencies +1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#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. @@ -853,21 +853,21 @@ git clone https://github.com/Jackett/Jackett.git cd Jackett/src # dotnet core version -dotnet publish Jackett.Server -f net5.0 --self-contained -r osx-x64 -c Debug # takes care of everything -./Jackett.Server/bin/Debug/net5.0/osx-x64/jackett # run jackett +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 ``` ### Linux ```bash -sudo apt install nuget msbuild dotnet-sdk-5.0 # install build tools (Debian/ubuntu) +sudo apt install nuget msbuild dotnet-sdk-6.0 # install build tools (Debian/ubuntu) git clone https://github.com/Jackett/Jackett.git cd Jackett/src # dotnet core version -dotnet publish Jackett.Server -f net5.0 --self-contained -r linux-x64 -c Debug # takes care of everything -./Jackett.Server/bin/Debug/net5.0/linux-x64/jackett # run jackett +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 ``` ## Screenshots diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b1925c965..a864e4cfe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,12 +2,12 @@ name: $(majorVersion).$(minorVersion).$(patchVersion) variables: majorVersion: 0 - minorVersion: 19 + minorVersion: 20 patchVersion: $[counter(variables['minorVersion'], 1)] # this will reset when we bump minor jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion) buildConfiguration: Release - netCoreFramework: net5.0 - netCoreSdkVersion: 5.0.x + netCoreFramework: net6.0 + netCoreSdkVersion: 6.0.x # system.debug: true trigger: @@ -380,7 +380,7 @@ stages: inputs: command: build projects: '**/*.Test*/*.csproj' - arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)' + arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --no-self-contained' - task: DotNetCoreCLI@2 displayName: Unit Tests (Mono, Linux and macOS) @@ -388,7 +388,7 @@ stages: inputs: command: test projects: '**/*.Test*/*.csproj' - arguments: '--configuration $(buildConfiguration) --framework $(framework) --runtime $(runtime)' + arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)' testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)' - task: DotNetCoreCLI@2 diff --git a/src/Jackett.Common/Jackett.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj index 65bf87d15..2c777a3dd 100644 --- a/src/Jackett.Common/Jackett.Common.csproj +++ b/src/Jackett.Common/Jackett.Common.csproj @@ -10,24 +10,24 @@ - - + + - - + + - - - - - + + + + + - - + + diff --git a/src/Jackett.Common/Services/UpdateService.cs b/src/Jackett.Common/Services/UpdateService.cs index 7d1168dff..1f972938b 100644 --- a/src/Jackett.Common/Services/UpdateService.cs +++ b/src/Jackett.Common/Services/UpdateService.cs @@ -252,7 +252,7 @@ namespace Jackett.Common.Services Stream inStream = File.OpenRead(gzPath); Stream gzipStream = new GZipInputStream(inStream); - var tarArchive = TarArchive.CreateInputTarArchive(gzipStream); + var tarArchive = TarArchive.CreateInputTarArchive(gzipStream, null); tarArchive.ExtractContents(tempDir); tarArchive.Close(); gzipStream.Close(); diff --git a/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj b/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj index 04ca67187..d54fcdbf3 100644 --- a/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj +++ b/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false false @@ -9,11 +9,11 @@ - - - + + + - + diff --git a/src/Jackett.Server/Jackett.Server.csproj b/src/Jackett.Server/Jackett.Server.csproj index 4a8b918f6..9774e369e 100644 --- a/src/Jackett.Server/Jackett.Server.csproj +++ b/src/Jackett.Server/Jackett.Server.csproj @@ -1,19 +1,19 @@ - net5.0;net461 + net6.0;net461 jackett.ico Exe false - + false - + false @@ -31,12 +31,12 @@ - - + + - - - + + + @@ -53,14 +53,14 @@ - - + + - - - - + + + + diff --git a/src/Jackett.Server/Services/SecurityService.cs b/src/Jackett.Server/Services/SecurityService.cs index 1d7f5853b..75ae04af1 100644 --- a/src/Jackett.Server/Services/SecurityService.cs +++ b/src/Jackett.Server/Services/SecurityService.cs @@ -25,10 +25,12 @@ namespace Jackett.Server.Services byte[] hashValue; var message = UE.GetBytes(input); +#pragma warning disable SYSLIB0021 var hashString = new SHA512Managed(); - var hex = ""; +#pragma warning restore SYSLIB0021 hashValue = hashString.ComputeHash(message); + var hex = ""; foreach (var x in hashValue) { hex += string.Format("{0:x2}", x); diff --git a/src/Jackett.Service/Jackett.Service.csproj b/src/Jackett.Service/Jackett.Service.csproj index 205a02661..0737914d3 100644 --- a/src/Jackett.Service/Jackett.Service.csproj +++ b/src/Jackett.Service/Jackett.Service.csproj @@ -1,7 +1,7 @@ - net5.0-windows + net6.0-windows WinExe JackettService jackett.ico diff --git a/src/Jackett.Test/Jackett.Test.csproj b/src/Jackett.Test/Jackett.Test.csproj index 4e8240b9b..b5d66ce54 100644 --- a/src/Jackett.Test/Jackett.Test.csproj +++ b/src/Jackett.Test/Jackett.Test.csproj @@ -1,7 +1,7 @@ - net5.0;net461 + net6.0;net461 false @@ -19,20 +19,20 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + - + diff --git a/src/Jackett.Tray/Jackett.Tray.csproj b/src/Jackett.Tray/Jackett.Tray.csproj index 33b8f1eb2..c21e3ce16 100644 --- a/src/Jackett.Tray/Jackett.Tray.csproj +++ b/src/Jackett.Tray/Jackett.Tray.csproj @@ -1,7 +1,7 @@ - net5.0-windows + net6.0-windows WinExe true JackettTray diff --git a/src/Jackett.Updater/Jackett.Updater.csproj b/src/Jackett.Updater/Jackett.Updater.csproj index 9d6b6d502..f536c127e 100644 --- a/src/Jackett.Updater/Jackett.Updater.csproj +++ b/src/Jackett.Updater/Jackett.Updater.csproj @@ -1,7 +1,7 @@ - net461;net5.0 + net6.0;net461 jackett.ico JackettUpdater Exe @@ -14,7 +14,7 @@ - +