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

Remove CsQuery and use AngleSharp instead. Closes #7292 (#7404)

Browse Source
This commit is contained in:
Diego Heras
2020-03-01 19:58:14 +01:00
committed by GitHub
parent 542f8d67e4
commit b944993733
7 changed files with 125 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Jackett.Common/Jackett.Common.csproj
View File

@@ -14,7 +14,6 @@
<PackageReference Include="BencodeNET" Version="3.1.0" /> <PackageReference Include="BencodeNET" Version="3.1.0" />
<PackageReference Include="CloudflareSolverRe" Version="1.0.6" /> <PackageReference Include="CloudflareSolverRe" Version="1.0.6" />
<PackageReference Include="CommandLineParser" Version="2.7.82" /> <PackageReference Include="CommandLineParser" Version="2.7.82" />
<PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
<PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" /> <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" /> <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
@@ -25,7 +24,7 @@
<PackageReference Include="SharpZipLib" Version="1.2.0" /> <PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" /> <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0" /> <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0" />
<PackageReference Include="YamlDotNet" Version="8.1.0" /> <PackageReference Include="YamlDotNet" Version="8.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -216,7 +215,7 @@
<ItemGroup> <ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" /> <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx"> <EmbeddedResource Update="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator> <Generator>PublicResXFileCodeGenerator</Generator>
@@ -230,5 +229,5 @@
<_Parameter1>$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss"))</_Parameter1> <_Parameter1>$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss"))</_Parameter1>
</AssemblyAttribute> </AssemblyAttribute>
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@@ -20,15 +20,15 @@
</PropertyGroup> </PropertyGroup>
</Otherwise> </Otherwise>
</Choose> </Choose>
<!-- Conditionally obtain references for the .NET Core App 3.1 target --> <!-- Conditionally obtain references for the .NET Core App 3.1 target -->
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" /> <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" /> <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
</ItemGroup> </ItemGroup>
<!-- Conditionally obtain references for the .NET461 target --> <!-- Conditionally obtain references for the .NET461 target -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
@@ -39,7 +39,7 @@
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="5.1.2" /> <PackageReference Include="Autofac" Version="5.1.2" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
@@ -57,12 +57,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\..\README.md" Visible="false"> <Content Include="..\..\README.md">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\..\LICENSE" Visible="false"> <Content Include="..\..\LICENSE">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
</Project> </Project>

36
src/Jackett.Service/Jackett.Service.csproj
View File

@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks> <TargetFramework>netcoreapp3.1</TargetFramework>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AssemblyName>JackettService</AssemblyName> <AssemblyName>JackettService</AssemblyName>
<ApplicationIcon>jackett.ico</ApplicationIcon> <ApplicationIcon>jackett.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" /> <ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="jackett.ico" /> <Content Include="jackett.ico" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@@ -1,49 +1,49 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Indexers\**" /> <Compile Remove="Indexers\**" />
<EmbeddedResource Remove="Indexers\**" /> <EmbeddedResource Remove="Indexers\**" />
<None Remove="Indexers\**" /> <None Remove="Indexers\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="Util\Invalid-RSS.xml" /> <None Remove="Util\Invalid-RSS.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Util\Invalid-RSS.xml" /> <EmbeddedResource Include="Util\Invalid-RSS.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="5.1.2" /> <PackageReference Include="Autofac" Version="5.1.2" />
<PackageReference Include="FluentAssertions" Version="5.10.2" /> <PackageReference Include="FluentAssertions" Version="5.10.2" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="3.1.2" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="3.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" /> <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" /> <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" /> <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" /> <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" /> <ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" />
<ProjectReference Include="..\Jackett.Server\Jackett.Server.csproj" /> <ProjectReference Include="..\Jackett.Server\Jackett.Server.csproj" />
</ItemGroup> </ItemGroup>
<!-- Conditionally obtain references for the .NET461 target --> <!-- Conditionally obtain references for the .NET461 target -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
</ItemGroup> </ItemGroup>
</Project> </Project>

46
src/Jackett.Tray/Jackett.Tray.csproj
View File

@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks> <TargetFramework>netcoreapp3.1</TargetFramework>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<AssemblyName>JackettTray</AssemblyName> <AssemblyName>JackettTray</AssemblyName>
<ApplicationIcon>jackett.ico</ApplicationIcon> <ApplicationIcon>jackett.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.7.82" /> <PackageReference Include="CommandLineParser" Version="2.7.82" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" /> <ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="jackett.ico" /> <Content Include="jackett.ico" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
<ApplicationIcon>jackett.ico</ApplicationIcon> <ApplicationIcon>jackett.ico</ApplicationIcon>
<AssemblyName>JackettUpdater</AssemblyName> <AssemblyName>JackettUpdater</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<Version>0.0.0</Version> <Version>0.0.0</Version>
<ServerGarbageCollection>false</ServerGarbageCollection> <ServerGarbageCollection>false</ServerGarbageCollection>
</PropertyGroup> </PropertyGroup>
<!-- Conditionally obtain references for the .NET461 target --> <!-- Conditionally obtain references for the .NET461 target -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" /> <ProjectReference Include="..\Jackett.Common\Jackett.Common.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

5
src/Jackett.Updater/Program.cs
View File

@@ -271,11 +271,12 @@ namespace Jackett.Updater
"Content/crissXcross.png", "Content/crissXcross.png",
"Content/css/jquery.dataTables.css", "Content/css/jquery.dataTables.css",
"Content/css/jquery.dataTables_themeroller.css", "Content/css/jquery.dataTables_themeroller.css",
"CsQuery.dll",
"CurlSharp.dll", "CurlSharp.dll",
"CurlSharp.pdb", "CurlSharp.pdb",
"Definitions/420files.yml", "Definitions/420files.yml",
"Definitions/aox.yml",
"Definitions/anidex.yml", // migrated to C# "Definitions/anidex.yml", // migrated to C#
"Definitions/aox.yml",
"Definitions/apollo.yml", // migrated to C# gazelle base tracker "Definitions/apollo.yml", // migrated to C# gazelle base tracker
"Definitions/archetorrent.yml", "Definitions/archetorrent.yml",
"Definitions/asiandvdclub.yml", "Definitions/asiandvdclub.yml",
@@ -383,9 +384,11 @@ namespace Jackett.Updater
"Microsoft.Owin.Hosting.dll", "Microsoft.Owin.Hosting.dll",
"Microsoft.Owin.StaticFiles.dll", "Microsoft.Owin.StaticFiles.dll",
"Owin.dll", "Owin.dll",
"System.ServiceModel.dll",
"System.Web.Http.dll", "System.Web.Http.dll",
"System.Web.Http.Owin.dll", "System.Web.Http.Owin.dll",
"System.Web.Http.Tracing.dll", "System.Web.Http.Tracing.dll",
"System.Xml.XPath.XmlDocument.dll"
}; };
foreach (var oldFile in oldFiles) foreach (var oldFile in oldFiles)