shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

core: bump .NET framework to 4.7.1 (#16184)

Browse Source
This commit is contained in:
Bogdan
2025-09-10 18:59:28 +03:00
committed by GitHub
parent dbf2a455c4
commit 22284d5106
8 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -763,7 +763,7 @@ If you want to run it with a user without a /home directory you need to add `Env
## Installation on Linux (ARMv6 or below) ## Installation on Linux (ARMv6 or below)
1. Install [Mono 5.8](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release is recommended) 1. Install [Mono 5.10](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release is recommended)
* Follow the instructions on the mono website and install the `mono-devel` and the `ca-certificates-mono` packages. * Follow the instructions on the mono website and install the `mono-devel` and the `ca-certificates-mono` packages.
* On Red Hat/CentOS/openSUSE/Fedora the `mono-locale-extras` package is also required. * On Red Hat/CentOS/openSUSE/Fedora the `mono-locale-extras` package is also required.
2. Install libcurl: 2. Install libcurl:

9
azure-pipelines.yml
View File

@@ -2,7 +2,7 @@
name: $(majorVersion).$(minorVersion).$(patchVersion) name: $(majorVersion).$(minorVersion).$(patchVersion)
variables: variables:
majorVersion: 0 majorVersion: 0
minorVersion: 22 minorVersion: 23
patchVersion: $[counter(variables['minorVersion'], 1)] # this will reset when we bump minor patchVersion: $[counter(variables['minorVersion'], 1)] # this will reset when we bump minor
jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion) jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
buildConfiguration: Release buildConfiguration: Release
@@ -108,7 +108,7 @@ stages:
Mono: Mono:
buildDescription: Mono buildDescription: Mono
imageName: ubuntu-22.04 imageName: ubuntu-22.04
framework: net462 framework: net471
runtime: linux-x64 runtime: linux-x64
archiveType: tar archiveType: tar
artifactName: Jackett.Binaries.Mono.tar.gz artifactName: Jackett.Binaries.Mono.tar.gz
@@ -280,7 +280,6 @@ stages:
$newVersion.Value = '4.0.0.0' $newVersion.Value = '4.0.0.0'
$xml.Save($file) $xml.Save($file)
Remove-Item '$(Build.BinariesDirectory)/Jackett/System.Net.Http.dll' Remove-Item '$(Build.BinariesDirectory)/Jackett/System.Net.Http.dll'
Remove-Item '$(Build.BinariesDirectory)/Jackett/System.Runtime.InteropServices.RuntimeInformation.dll'
- task: Bash@3 - task: Bash@3
displayName: Set Folder and File Permissions (Mono, Linux and macOS) displayName: Set Folder and File Permissions (Mono, Linux and macOS)
@@ -438,7 +437,7 @@ stages:
Mono: Mono:
buildDescription: Mono buildDescription: Mono
imageName: ubuntu-22.04 imageName: ubuntu-22.04
framework: net462 framework: net471
runtime: linux-x64 runtime: linux-x64
pool: pool:
vmImage: $(imageName) vmImage: $(imageName)
@@ -535,7 +534,7 @@ stages:
buildDescription: Mono buildDescription: Mono
imageName: ubuntu-22.04 imageName: ubuntu-22.04
artifactName: Jackett.Binaries.Mono.tar.gz artifactName: Jackett.Binaries.Mono.tar.gz
framework: net462 framework: net471
runtime: linux-x64 runtime: linux-x64
pool: pool:
vmImage: $(imageName) vmImage: $(imageName)

2
src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net8.0;net462</TargetFrameworks> <TargetFrameworks>net8.0;net471</TargetFrameworks>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<NoWarn /> <NoWarn />
<TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

4
src/Jackett.Server/Helper.cs
View File

@@ -3,7 +3,7 @@ using Jackett.Common.Models.Config;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using NLog; using NLog;
#if !NET462 #if !NET471
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
#endif #endif
@@ -13,7 +13,7 @@ namespace Jackett.Server
{ {
public static IContainer ApplicationContainer { get; set; } public static IContainer ApplicationContainer { get; set; }
#if NET462 #if NET471
public static IApplicationLifetime applicationLifetime; public static IApplicationLifetime applicationLifetime;
#else #else
public static IHostApplicationLifetime applicationLifetime; public static IHostApplicationLifetime applicationLifetime;

8
src/Jackett.Server/Jackett.Server.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<PackageId>$(MSBuildProjectName)</PackageId> <PackageId>$(MSBuildProjectName)</PackageId>
<TargetFrameworks>net8.0;net462</TargetFrameworks> <TargetFrameworks>net8.0;net471</TargetFrameworks>
<ApplicationIcon>jackett.ico</ApplicationIcon> <ApplicationIcon>jackett.ico</ApplicationIcon>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<NoWarn></NoWarn> <NoWarn></NoWarn>
@@ -21,7 +21,7 @@
</PropertyGroup> </PropertyGroup>
<Choose> <Choose>
<When Condition="'$(TargetFramework)' != 'net462' and $(RuntimeIdentifier.Contains('win')) == 'false'"> <When Condition="'$(TargetFramework)' != 'net471' and $(RuntimeIdentifier.Contains('win')) == 'false'">
<PropertyGroup> <PropertyGroup>
<AssemblyName>jackett</AssemblyName> <AssemblyName>jackett</AssemblyName>
</PropertyGroup> </PropertyGroup>
@@ -40,8 +40,8 @@
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" /> <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<!-- Conditionally obtain references for the .NET462 target --> <!-- Conditionally obtain references for the .NET471 target -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
<PackageReference Include="Microsoft.AspNetCore" Version="2.3.0" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.3.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.3.0" />

6
src/Jackett.Server/Startup.cs
View File

@@ -22,7 +22,7 @@ using Microsoft.AspNetCore.Rewrite;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
#if !NET462 #if !NET471
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
#endif #endif
@@ -66,7 +66,7 @@ namespace Jackett.Server
options.KnownProxies.Clear(); options.KnownProxies.Clear();
}); });
#if NET462 #if NET471
services.AddMvc( services.AddMvc(
config => config.Filters.Add( config => config.Filters.Add(
new AuthorizeFilter( new AuthorizeFilter(
@@ -118,7 +118,7 @@ namespace Jackett.Server
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
#if NET462 #if NET471
public void Configure(IApplicationBuilder app, IHostingEnvironment env, IApplicationLifetime applicationLifetime) public void Configure(IApplicationBuilder app, IHostingEnvironment env, IApplicationLifetime applicationLifetime)
{ {
applicationLifetime.ApplicationStarted.Register(OnStarted); applicationLifetime.ApplicationStarted.Register(OnStarted);

6
src/Jackett.Test/Jackett.Test.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net8.0;net462</TargetFrameworks> <TargetFrameworks>net8.0;net471</TargetFrameworks>
<NoWarn /> <NoWarn />
<TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors /> <WarningsAsErrors />
@@ -45,8 +45,8 @@
<ProjectReference Include="..\Jackett.Server\Jackett.Server.csproj" /> <ProjectReference Include="..\Jackett.Server\Jackett.Server.csproj" />
</ItemGroup> </ItemGroup>
<!-- Conditionally obtain references for the .NET462 target --> <!-- Conditionally obtain references for the .NET471 target -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
</ItemGroup> </ItemGroup>

6
src/Jackett.Updater/Jackett.Updater.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net8.0;net462</TargetFrameworks> <TargetFrameworks>net8.0;net471</TargetFrameworks>
<ApplicationIcon>jackett.ico</ApplicationIcon> <ApplicationIcon>jackett.ico</ApplicationIcon>
<AssemblyName>JackettUpdater</AssemblyName> <AssemblyName>JackettUpdater</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
@@ -13,8 +13,8 @@
<DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISLINUXMUSL</DefineConstants> <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISLINUXMUSL</DefineConstants>
</PropertyGroup> </PropertyGroup>
<!-- Conditionally obtain references for the .NET462 target --> <!-- Conditionally obtain references for the .NET471 target -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
</ItemGroup> </ItemGroup>