From c747af4e4b115b7934dafbd1d5ff0ef94b621f24 Mon Sep 17 00:00:00 2001
From: Atif Aziz <code@raboof.com>
Date: Sat, 15 Oct 2022 14:00:47 +0200
Subject: [PATCH 1/4] Drop .NET Core 2.1 target that's reached end-of-life

End-of-life for .NET Core 2.1 was August 21, 2021.
---
 MoreLinq.Test/MoreLinq.Test.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MoreLinq.Test/MoreLinq.Test.csproj b/MoreLinq.Test/MoreLinq.Test.csproj
index 7558169e9..f0cc95619 100644
--- a/MoreLinq.Test/MoreLinq.Test.csproj
+++ b/MoreLinq.Test/MoreLinq.Test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>MoreLinq.Test</AssemblyTitle>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net451</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net451</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>MoreLinq.Test</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -41,7 +41,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1' And '$(TargetFramework)' != 'net451'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net451'">
     <PackageReference Include="System.Linq.Async" Version="5.0.0" />
     <Compile Include="Async\*.cs" />
   </ItemGroup>

From 3d62699c18fa22f4fa23bb5fad117636423c41a6 Mon Sep 17 00:00:00 2001
From: Atif Aziz <code@raboof.com>
Date: Sat, 15 Oct 2022 14:08:03 +0200
Subject: [PATCH 2/4] Remove .NET Core 2.1 runtime installation on CI host

---
 appveyor.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d2b14361a..f6714c83c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,10 +54,8 @@ install:
 - git reset --hard
 - ps: if ($isWindows) { tools\dotnet-install.ps1 -JSonFile global.json }
 - ps: if ($isWindows) { tools\dotnet-install.ps1 -Runtime dotnet -Version 3.1.10 -SkipNonVersionedFiles }
-- ps: if ($isWindows) { tools\dotnet-install.ps1 -Runtime dotnet -Version 2.1.23 -SkipNonVersionedFiles }
 - sh: ./tools/dotnet-install.sh --jsonfile global.json
 - sh: ./tools/dotnet-install.sh --runtime dotnet --version 3.1.10 --skip-non-versioned-files
-- sh: ./tools/dotnet-install.sh --runtime dotnet --version 2.1.23 --skip-non-versioned-files
 - sh: export PATH="~/.dotnet:$PATH"
 before_build:
 - dotnet --info

From 983d4db325e069f949fe838cc6d9633f765292c0 Mon Sep 17 00:00:00 2001
From: Atif Aziz <code@raboof.com>
Date: Sat, 15 Oct 2022 14:22:46 +0200
Subject: [PATCH 3/4] Remove .NET Core 2.1 target from scripts

---
 test.cmd | 2 --
 test.sh  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test.cmd b/test.cmd
index 03ed51dc9..c49d3d317 100644
--- a/test.cmd
+++ b/test.cmd
@@ -9,8 +9,6 @@ setlocal
 call build ^
   && call :test net5.0 Debug ^
   && call :test net5.0 Debug ^
-  && call :test netcoreapp2.1 Debug ^
-  && call :test netcoreapp2.1 Release ^
   && call :test netcoreapp3.1 Debug ^
   && call :test netcoreapp3.1 Release ^
   && call :test net451 Debug ^
diff --git a/test.sh b/test.sh
index 9108be273..c25f47b77 100755
--- a/test.sh
+++ b/test.sh
@@ -7,7 +7,7 @@ if [[ -z "$1" ]]; then
 else
     configs="$1"
 fi
-for f in netcoreapp2.1 netcoreapp3.1 net5.0; do
+for f in netcoreapp3.1 net5.0; do
     for c in $configs; do
         if [[ "$c" == "Debug" ]]; then
             coverage_args="-p:CollectCoverage=true

From c801e52863de8380734251b0db80411f86e05fd5 Mon Sep 17 00:00:00 2001
From: Atif Aziz <code@raboof.com>
Date: Sat, 15 Oct 2022 14:25:07 +0200
Subject: [PATCH 4/4] Remove .NET 5 target

---
 MoreLinq.Test/MoreLinq.Test.csproj | 2 +-
 appveyor.yml                       | 2 +-
 test.cmd                           | 2 --
 test.sh                            | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/MoreLinq.Test/MoreLinq.Test.csproj b/MoreLinq.Test/MoreLinq.Test.csproj
index f0cc95619..7e68c18a2 100644
--- a/MoreLinq.Test/MoreLinq.Test.csproj
+++ b/MoreLinq.Test/MoreLinq.Test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>MoreLinq.Test</AssemblyTitle>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net451</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net451</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>MoreLinq.Test</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/appveyor.yml b/appveyor.yml
index f6714c83c..623f94ea2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -82,7 +82,7 @@ build_script:
 test_script:
 - cmd: test.cmd
 - sh: ./test.sh
-- ps: dotnet reportgenerator -reports:MoreLinq.Test/coverage.net5.0.opencover.xml -targetdir:tmp/cover -tag:(git show -q --pretty=%H)
+- ps: dotnet reportgenerator -reports:MoreLinq.Test/coverage.netcoreapp3.1.opencover.xml -targetdir:tmp/cover -tag:(git show -q --pretty=%H)
 - ps: |
     cd tmp/cover
     tar -cz -f "../../coverage-report-${IMAGE_NAME}.tar.gz" *
diff --git a/test.cmd b/test.cmd
index c49d3d317..0c960df8b 100644
--- a/test.cmd
+++ b/test.cmd
@@ -7,8 +7,6 @@ goto :EOF
 :main
 setlocal
 call build ^
-  && call :test net5.0 Debug ^
-  && call :test net5.0 Debug ^
   && call :test netcoreapp3.1 Debug ^
   && call :test netcoreapp3.1 Release ^
   && call :test net451 Debug ^
diff --git a/test.sh b/test.sh
index c25f47b77..46c4efc91 100755
--- a/test.sh
+++ b/test.sh
@@ -7,7 +7,7 @@ if [[ -z "$1" ]]; then
 else
     configs="$1"
 fi
-for f in netcoreapp3.1 net5.0; do
+for f in netcoreapp3.1; do
     for c in $configs; do
         if [[ "$c" == "Debug" ]]; then
             coverage_args="-p:CollectCoverage=true