From c99d4022c66d341260461af1b95e6ce61c642f95 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Mon, 17 Jan 2022 08:50:56 +0000
Subject: [PATCH 1/3] Target .NET 6

Target .NET 6 in the tests and benchmarks.
---
 src/Polly.Benchmarks/Polly.Benchmarks.csproj | 4 ++--
 src/Polly.Specs/Polly.Specs.csproj           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Polly.Benchmarks/Polly.Benchmarks.csproj b/src/Polly.Benchmarks/Polly.Benchmarks.csproj
index 1c0315cb01..594ce9d5d4 100644
--- a/src/Polly.Benchmarks/Polly.Benchmarks.csproj
+++ b/src/Polly.Benchmarks/Polly.Benchmarks.csproj
@@ -3,11 +3,11 @@
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(BenchmarkFromNuGet)' != 'True' ">
     <ProjectReference Include="..\Polly\Polly.csproj" />
diff --git a/src/Polly.Specs/Polly.Specs.csproj b/src/Polly.Specs/Polly.Specs.csproj
index 2d6ba13a09..7b2b1371a9 100644
--- a/src/Polly.Specs/Polly.Specs.csproj
+++ b/src/Polly.Specs/Polly.Specs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net461;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net6.0;net461;net472</TargetFrameworks>
     <!-- Disable warning about End-of-Life .NET versions -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>

From bf56b61dc3bca7cd3dae2bb3e433c0e5701832f3 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Mon, 17 Jan 2022 08:54:41 +0000
Subject: [PATCH 2/3] Update NuGet packages

Update various NuGet packages to their latest versions.
---
 src/Polly.Benchmarks/Polly.Benchmarks.csproj | 2 +-
 src/Polly.Specs/Polly.Specs.csproj           | 2 +-
 src/Polly/Polly.csproj                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Polly.Benchmarks/Polly.Benchmarks.csproj b/src/Polly.Benchmarks/Polly.Benchmarks.csproj
index 594ce9d5d4..e4eb1d9d83 100644
--- a/src/Polly.Benchmarks/Polly.Benchmarks.csproj
+++ b/src/Polly.Benchmarks/Polly.Benchmarks.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(BenchmarkFromNuGet)' != 'True' ">
diff --git a/src/Polly.Specs/Polly.Specs.csproj b/src/Polly.Specs/Polly.Specs.csproj
index 7b2b1371a9..6ad7be03ae 100644
--- a/src/Polly.Specs/Polly.Specs.csproj
+++ b/src/Polly.Specs/Polly.Specs.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
diff --git a/src/Polly/Polly.csproj b/src/Polly/Polly.csproj
index 4161a9e5d0..6bfe96ca0c 100644
--- a/src/Polly/Polly.csproj
+++ b/src/Polly/Polly.csproj
@@ -24,7 +24,7 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup Label="SourceLink">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>

From 17cede5b94db871b0a086f551b510531fe8f8194 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Mon, 17 Jan 2022 09:05:25 +0000
Subject: [PATCH 3/3] Update to Visual Studio 2022

Use the Visual Studio 2022 image for a .NET 6 installation.
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index d9b8b12e15..8494dd7f5c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2019
+os: Visual Studio 2022
 
 # Build script
 build_script: