core: update .net7.0

Jackett · Jan 7, 2023 · cec0327 · cec0327
1 parent d751eb8
commit cec0327
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -65,7 +65,7 @@ jobs:
  - name: Set up dotnet
  uses: actions/setup-dotnet@v2
  with:
- dotnet-version: '6.0.*'
+ dotnet-version: '7.0.*'
 
  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
  # If this step fails, then you should remove it and run the build manually (see below)
@@ -86,4 +86,4 @@ jobs:
 
  - name: Perform CodeQL Analysis
  uses: github/codeql-action/analyze@v1
- 
+
diff --git 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/7.0/supported-os.md#linux)
 * macOS 10.15+ or greater
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
@@ -847,21 +847,21 @@ 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 net7.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net7.0/osx-x64/jackett # run jackett
 ```
 
 ### Linux
 
 
 ```bash
-sudo apt install nuget msbuild dotnet-sdk-6.0 # install build tools (Debian/ubuntu)
+sudo apt install nuget msbuild dotnet-sdk-7.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 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 net7.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net7.0/linux-x64/jackett # run jackett
 ```
 
 ## Screenshots

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -2,12 +2,12 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
  majorVersion: 0
- minorVersion: 20
+ minorVersion: 21
  patchVersion: $[counter(variables['minorVersion'], 1)] # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
- netCoreFramework: net6.0
- netCoreSdkVersion: 6.0.403 # #13806 & dotnet/runtime#79796
+ netCoreFramework: net7.0
+ netCoreSdkVersion: 7.0.x
  # system.debug: true
 
 trigger:
@@ -116,7 +116,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
@@ -27,7 +27,7 @@
  <PackageReference Include="polly" Version="7.2.3" />
  <PackageReference Include="SharpZipLib" Version="1.4.1" />
  <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
- <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
+ <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
  <PackageReference Include="YamlDotNet" Version="12.3.1" />
  </ItemGroup>
 

diff --git a/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj b/src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net6.0;net462</TargetFrameworks>
+ <TargetFrameworks>net7.0;net462</TargetFrameworks>
  <IsPackable>false</IsPackable>
  <NoWarn />
  <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

diff --git a/src/Jackett.Server/Jackett.Server.csproj b/src/Jackett.Server/Jackett.Server.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFrameworks>net6.0;net462</TargetFrameworks>
+ <TargetFrameworks>net7.0;net462</TargetFrameworks>
  <ApplicationIcon>jackett.ico</ApplicationIcon>
  <OutputType>Exe</OutputType>
  <NoWarn></NoWarn>
  <ServerGarbageCollection>false</ServerGarbageCollection>
  <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISLINUXMUSL</DefineConstants>
  </PropertyGroup>
 
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
  <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  <WarningsAsErrors />
  </PropertyGroup>
 
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
  <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  <WarningsAsErrors />
  </PropertyGroup>
@@ -32,11 +32,11 @@
  </Otherwise>
  </Choose>
 
- <!-- Conditionally obtain references for the .NET 6.0 target -->
- <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.12" />
- <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
- <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="6.0.0" />
+ <!-- Conditionally obtain references for the .NET 7.0 target -->
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+ <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.0" />
  </ItemGroup>
 
  <!-- Conditionally obtain references for the .NET462 target -->
@@ -56,11 +56,11 @@
  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
  <PackageReference Include="AutoMapper" Version="10.1.1" />
  <PackageReference Include="CommandLineParser" Version="2.9.1" />
- <PackageReference Include="Mono.Posix" Version="7.1.0-final.1.21458.1" />
+  <PackageReference Include="Mono.Posix" Version="7.1.0-final.1.21458.1" />
  <PackageReference Include="NLog" Version="5.1.1" />
  <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.1" />
- <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
- <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+ <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/Jackett.Service/Jackett.Service.csproj b/src/Jackett.Service/Jackett.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net6.0-windows</TargetFramework>
+ <TargetFramework>net7.0-windows</TargetFramework>
  <OutputType>WinExe</OutputType>
  <AssemblyName>JackettService</AssemblyName>
  <ApplicationIcon>jackett.ico</ApplicationIcon>

diff --git a/src/Jackett.Test/Jackett.Test.csproj b/src/Jackett.Test/Jackett.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net6.0;net462</TargetFrameworks>
+ <TargetFrameworks>net7.0;net462</TargetFrameworks>
  <NoWarn />
  <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  <WarningsAsErrors />
@@ -25,14 +25,14 @@
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
  <PackageReference Include="FluentAssertions" Version="6.8.0" />
- <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="6.0.12" />
+ <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.1" />
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
  <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
  <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
  <PackageReference Include="NUnit" Version="3.13.3" />
  <PackageReference Include="NUnit.ConsoleRunner" Version="3.16.1" />
  <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
- <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/Jackett.Tray/Jackett.Tray.csproj b/src/Jackett.Tray/Jackett.Tray.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net6.0-windows</TargetFramework>
+ <TargetFramework>net7.0-windows</TargetFramework>
  <OutputType>WinExe</OutputType>
  <UseWindowsForms>true</UseWindowsForms>
  <AssemblyName>JackettTray</AssemblyName>

diff --git a/src/Jackett.Updater/Jackett.Updater.csproj b/src/Jackett.Updater/Jackett.Updater.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net6.0;net462</TargetFrameworks>
+ <TargetFrameworks>net7.0;net462</TargetFrameworks>
  <ApplicationIcon>jackett.ico</ApplicationIcon>
  <AssemblyName>JackettUpdater</AssemblyName>
  <OutputType>Exe</OutputType>