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

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

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" />

View File

@@ -57,10 +57,10 @@
</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>

View File

@@ -1,7 +1,7 @@
<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>

View File

@@ -1,7 +1,7 @@
<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>

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)