From e188454fec26ffd674c487650f397de8986c7b77 Mon Sep 17 00:00:00 2001
From: flightlevel <flightlevel@users.noreply.github.com>
Date: Thu, 10 Jan 2019 20:22:15 +1100
Subject: [PATCH] Use NETStandard for Jackett.Common

---
 src/Jackett.Common/Jackett.Common.csproj   | 19 ++++---------------
 src/Jackett.Updater/Jackett.Updater.csproj |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/Jackett.Common/Jackett.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj
index 140fa9441..aab0f03de 100644
--- a/src/Jackett.Common/Jackett.Common.csproj
+++ b/src/Jackett.Common/Jackett.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Version>0.0.0</Version>
     <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
@@ -13,28 +13,17 @@
     <PackageReference Include="BencodeNET" Version="2.2.24" />
     <PackageReference Include="CloudFlareUtilities" Version="1.2.0" />
     <PackageReference Include="CommandLineParser" Version="2.4.3" />
+    <PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
     <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="MimeMapping" Version="1.0.1.12" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NLog" Version="4.5.11" />
     <PackageReference Include="SharpZipLib" Version="1.1.0" />
-    <PackageReference Include="YamlDotNet" Version="5.3.0" />
-  </ItemGroup>
-
-  <!-- Conditionally obtain references for the .NET Full framework target -->
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
-    <PackageReference Include="CsQuery" Version="1.3.5-beta5" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.1.2" />
-    <Reference Include="System.ServiceProcess" />
-  </ItemGroup>
-
-  <!-- Conditionally obtain references for the .NETStandard target -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
+    <PackageReference Include="YamlDotNet" Version="5.3.0" />    
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Jackett.Updater/Jackett.Updater.csproj b/src/Jackett.Updater/Jackett.Updater.csproj
index cae4a0d6a..df289bd93 100644
--- 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>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
     <ApplicationIcon>jackett.ico</ApplicationIcon>
     <AssemblyName>JackettUpdater</AssemblyName>
     <OutputType>Exe</OutputType>