From 66968df166d6ef3963aae638096fe0712ad61397 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Fri, 1 Oct 2021 06:52:49 -0600
Subject: [PATCH] Drop netcoreapp2.1 testing

---
 azure-pipelines/dotnet.yml                                | 8 --------
 test/Directory.Build.props                                | 1 -
 .../Microsoft.VisualStudio.Validation.Tests.csproj        | 3 +++
 .../VerifyTests.cs                                        | 2 --
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml
index 1b2a2be5..96d6c21e 100644
--- a/azure-pipelines/dotnet.yml
+++ b/azure-pipelines/dotnet.yml
@@ -12,14 +12,6 @@ steps:
     arguments: --no-build -c $(BuildConfiguration) -f net472 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_net472.binlog"
     testRunTitle: net472-$(Agent.JobName)
 
-- task: DotNetCoreCLI@2
-  displayName: dotnet test -f netcoreapp2.1
-  inputs:
-    command: test
-    arguments: --no-build -c $(BuildConfiguration) -f netcoreapp2.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_netcoreapp2.1.binlog"
-    testRunTitle: netcoreapp2.1-$(Agent.JobName)
-  condition: succeededOrFailed()
-
 - task: DotNetCoreCLI@2
   displayName: dotnet test -f netcoreapp3.1
   inputs:
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 43c5f55f..8f3fb938 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -2,7 +2,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))\Directory.Build.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))' != '' " />
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RootNamespace />
diff --git a/test/Microsoft.VisualStudio.Validation.Tests/Microsoft.VisualStudio.Validation.Tests.csproj b/test/Microsoft.VisualStudio.Validation.Tests/Microsoft.VisualStudio.Validation.Tests.csproj
index ba62a6d0..7cd621e6 100644
--- a/test/Microsoft.VisualStudio.Validation.Tests/Microsoft.VisualStudio.Validation.Tests.csproj
+++ b/test/Microsoft.VisualStudio.Validation.Tests/Microsoft.VisualStudio.Validation.Tests.csproj
@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net472;netcoreapp3.1;net5.0</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/test/Microsoft.VisualStudio.Validation.Tests/VerifyTests.cs b/test/Microsoft.VisualStudio.Validation.Tests/VerifyTests.cs
index 18ff0f0b..1053b725 100644
--- a/test/Microsoft.VisualStudio.Validation.Tests/VerifyTests.cs
+++ b/test/Microsoft.VisualStudio.Validation.Tests/VerifyTests.cs
@@ -67,7 +67,6 @@ public void FailOperation()
         Assert.Throws<InvalidOperationException>(() => Verify.FailOperation("message", "arg1"));
     }
 
-#if !NETCOREAPP2_1
     [Fact]
     public void HResult()
     {
@@ -79,7 +78,6 @@ public void HResult()
         Assert.Throws<ArgumentException>(() => Verify.HResult(E_INVALIDARG, ignorePreviousComCalls: true));
         Assert.Throws<COMException>(() => Verify.HResult(E_FAIL, ignorePreviousComCalls: true));
     }
-#endif
 
     private class Disposable : IDisposableObservable
     {