From 1be35d73ce8a92720f64519a9a68bb3e2794be7a Mon Sep 17 00:00:00 2001
From: Romfos <Romfos@tut.by>
Date: Tue, 24 Dec 2019 20:56:38 +0300
Subject: [PATCH] Added .NET Core 3.1 support

---
 src/AK.PfxTool.csproj        | 14 +++++++-------
 test/AK.PfxTool.Tests.csproj | 11 +++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/AK.PfxTool.csproj b/src/AK.PfxTool.csproj
index 29cad07..2e28e07 100644
--- a/src/AK.PfxTool.csproj
+++ b/src/AK.PfxTool.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
 	<OutputType>Exe</OutputType>
-	<TargetFramework>netcoreapp2.2</TargetFramework>
+	<TargetFrameworks>netcoreapp3.1;netcoreapp2.2</TargetFrameworks>
 	<RootNamespace>AK.PfxTool</RootNamespace>
 	<AssemblyName>pfxtool</AssemblyName>
-	<Version>1.0.0</Version>
+	<Version>2.0.0</Version>
 	<PackageId>pfxtool</PackageId>
 	<IsPackable>true</IsPackable>
 	<PackAsTool>true</PackAsTool>
-	<PackageVersion>1.0.0</PackageVersion>
+	<PackageVersion>2.0.0</PackageVersion>
 	<Authors>Aashish Koirala</Authors>
 	<Company>Aashish Koirala</Company>
 	<Product>PFX Tool</Product>
@@ -25,8 +25,8 @@
 	<PackageIconUrl>https://pfxtool.aashishkoirala.com/assets/favicon.ico</PackageIconUrl>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
-	<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
-	<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
+	<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
+	<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
+	<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/AK.PfxTool.Tests.csproj b/test/AK.PfxTool.Tests.csproj
index 656e792..2af992a 100644
--- a/test/AK.PfxTool.Tests.csproj
+++ b/test/AK.PfxTool.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<TargetFramework>netcoreapp2.2</TargetFramework>
+	<TargetFrameworks>netcoreapp3.1;netcoreapp2.2</TargetFrameworks>
 	<IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -12,9 +12,12 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-	<PackageReference Include="xunit" Version="2.4.0" />
-	<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+	<PackageReference Include="xunit" Version="2.4.1" />
+	<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+	  <PrivateAssets>all</PrivateAssets>
+	  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	</PackageReference>
   </ItemGroup>
   <ItemGroup>
 	<ProjectReference Include="..\src\AK.PfxTool.csproj" />