From 09122df4362dc384a33493b0f3e137d2673c3062 Mon Sep 17 00:00:00 2001
From: Niklas Lundberg <niklas.lundberg@telenor.se>
Date: Wed, 5 Feb 2020 08:37:33 +0100
Subject: [PATCH 1/2] Support ASP.NET Core 3.1.

---
 .../Activout.RestClient.Test.csproj            | 14 ++++++++------
 Activout.RestClient/Activout.RestClient.csproj | 18 ++++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Activout.RestClient.Test/Activout.RestClient.Test.csproj b/Activout.RestClient.Test/Activout.RestClient.Test.csproj
index 740b536..c257cd3 100644
--- a/Activout.RestClient.Test/Activout.RestClient.Test.csproj
+++ b/Activout.RestClient.Test/Activout.RestClient.Test.csproj
@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="RichardSzalay.MockHttp" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.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="..\Activout.RestClient\Activout.RestClient.csproj" />
diff --git a/Activout.RestClient/Activout.RestClient.csproj b/Activout.RestClient/Activout.RestClient.csproj
index 3310845..216ab91 100644
--- a/Activout.RestClient/Activout.RestClient.csproj
+++ b/Activout.RestClient/Activout.RestClient.csproj
@@ -1,11 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PackageId>Activout.RestClient</PackageId>
+    <Description>Create a REST(ish) API client only by defining the C# interface you want.</Description>
+    <Product>Activout Rest Client</Product>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/twogood/Activout.RestClient.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>3.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ImpromptuInterface" Version="7.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="System.Linq" Version="4.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 2456aeab154304473d574d436bc3d2ec9115efdc Mon Sep 17 00:00:00 2001
From: David Eriksson <david.x.eriksson@telenor.se>
Date: Wed, 5 Feb 2020 10:47:18 +0100
Subject: [PATCH 2/2] Build with .NET 3.1 on Travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e114607..8ea8c73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: csharp
 solution: ActivoutRestClient.sln
 mono: none
-dotnet: 2.2.203
+dotnet: 3.1.101
 dist: xenial
 install:
   - dotnet tool install --global dotnet-sonarscanner