From 8757eeb9bd3d96c83c9fc62d5721a44a9998095c Mon Sep 17 00:00:00 2001
From: Claire Novotny <claire@novotny.org>
Date: Wed, 26 Jan 2022 11:47:54 -0500
Subject: [PATCH] Add .net6

---
 .../InterfaceStubGenerator.Roslyn40.csproj                | 2 +-
 Refit.HttpClientFactory/Refit.HttpClientFactory.csproj    | 8 ++++++--
 Refit.Newtonsoft.Json/Refit.Newtonsoft.Json.csproj        | 2 +-
 Refit.Tests/Refit.Tests.csproj                            | 2 +-
 Refit/Refit.csproj                                        | 2 +-
 azure-pipelines.yml                                       | 3 +--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/InterfaceStubGenerator.Roslyn40/InterfaceStubGenerator.Roslyn40.csproj b/InterfaceStubGenerator.Roslyn40/InterfaceStubGenerator.Roslyn40.csproj
index 4a8cded8d..ff5bcf9d7 100644
--- a/InterfaceStubGenerator.Roslyn40/InterfaceStubGenerator.Roslyn40.csproj
+++ b/InterfaceStubGenerator.Roslyn40/InterfaceStubGenerator.Roslyn40.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-2.final" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
   </ItemGroup>
 
   <Target Name="SetBuildVer" AfterTargets="GetBuildVersion" BeforeTargets="SetCloudBuildVersionVars;SetCloudBuildNumberWithVersion">
diff --git a/Refit.HttpClientFactory/Refit.HttpClientFactory.csproj b/Refit.HttpClientFactory/Refit.HttpClientFactory.csproj
index 7b536e22d..49a73c3f2 100644
--- a/Refit.HttpClientFactory/Refit.HttpClientFactory.csproj
+++ b/Refit.HttpClientFactory/Refit.HttpClientFactory.csproj
@@ -3,13 +3,17 @@
   <PropertyGroup>
     <Product>Refit HTTP Client Factory Extensions</Product>
     <Description>Refit HTTP Client Factory Extensions</Description>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Refit\Refit.csproj" PrivateAssets="Analyzers" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Update="Microsoft.Extensions.Http" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
diff --git a/Refit.Newtonsoft.Json/Refit.Newtonsoft.Json.csproj b/Refit.Newtonsoft.Json/Refit.Newtonsoft.Json.csproj
index f0fca8957..947da3c22 100644
--- a/Refit.Newtonsoft.Json/Refit.Newtonsoft.Json.csproj
+++ b/Refit.Newtonsoft.Json/Refit.Newtonsoft.Json.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>Refit Serializer for Newtonsoft.Json ($(TargetFramework))</Product>
     <Description>Refit Serializers for Newtonsoft.Json</Description>
-    <TargetFrameworks>net5.0;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.0;net461</TargetFrameworks>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
     <RootNamespace>Refit</RootNamespace>
     <Nullable>enable</Nullable>
diff --git a/Refit.Tests/Refit.Tests.csproj b/Refit.Tests/Refit.Tests.csproj
index 42554e180..c7c165f4c 100644
--- a/Refit.Tests/Refit.Tests.csproj
+++ b/Refit.Tests/Refit.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\Refit\targets\refit.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <Deterministic>false</Deterministic> <!-- Some tests rely on CallerFilePath -->
   </PropertyGroup>
 
diff --git a/Refit/Refit.csproj b/Refit/Refit.csproj
index cd645a1eb..3e2240dc6 100644
--- a/Refit/Refit.csproj
+++ b/Refit/Refit.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>Refit ($(TargetFramework))</Product>
-    <TargetFrameworks>net5.0;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
   
     <Nullable>enable</Nullable>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 039677270..289d87b6f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -31,11 +31,10 @@ stages:
 
     steps:
     - task: UseDotNet@2
-      displayName: Use .NET Core 5.x SDK
+      displayName: Use .NET 6.x SDK
       inputs:
         version: 6.x
         performMultiLevelLookup: true
-        includePreviewVersions: true
 
     - task: UseDotNet@2
       displayName: Use .NET Core 5.x Runtime