From 3f909a8e8fa5214d2a34c1801af84a5c8d19ca75 Mon Sep 17 00:00:00 2001
From: Claire Novotny <claire@novotny.org>
Date: Fri, 23 Apr 2021 10:17:27 -0400
Subject: [PATCH] use latest sdk:

---
 azure-pipelines.yml                        | 15 +++++++--------
 src/Directory.Build.targets                | 11 -----------
 src/Humanizer.Tests/Humanizer.Tests.csproj |  4 ++--
 3 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 src/Directory.Build.targets

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8a326d02b..7988e550f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,16 +19,15 @@ stages:
 
     steps:
     - task: UseDotNet@2
-      displayName: 'Use .NET Core SDK 3.x'
+      displayName: 'Use .NET Core SDK 5.x'
       inputs:
-        version: 3.x
+        version: 5.x
 
     - task: UseDotNet@2
-      displayName: 'Use .NET Core Runtime 2.1.x'
+      displayName: 'Use .NET Core Runtime 3.x'
       inputs:
-        version: 2.1.x
-        packageType: runtime
-        
+        version: 3.x
+        packageType: runtime 
 
     - task: DotNetCoreCLI@2  
       inputs:
@@ -76,14 +75,14 @@ stages:
         arguments: install --tool-path . dotnet-reportgenerator-globaltool
       displayName: Install ReportGenerator tool
 
-    - script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports -reporttypes:"Cobertura"
+    - script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"
       displayName: Create reports
 
     - task: PublishCodeCoverageResults@1
       displayName: 'Publish code coverage'
       inputs:
         codeCoverageTool: Cobertura
-        summaryFileLocation: $(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports/Cobertura.xml
+        summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml
       
     - publish: $(Build.ArtifactStagingDirectory)\Packages
       displayName: Publish build packages
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
deleted file mode 100644
index 12c61a902..000000000
--- a/src/Directory.Build.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-
-  <Target Name="CoverletGetPathMap"
-          DependsOnTargets="InitializeSourceRootMappedPaths"
-          Returns="@(_LocalTopLevelSourceRoot)"
-          Condition="'$(DeterministicSourcePaths)' == 'true'">
-    <ItemGroup>
-      <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Humanizer.Tests/Humanizer.Tests.csproj b/src/Humanizer.Tests/Humanizer.Tests.csproj
index 5fef09d36..c6cf93d93 100644
--- a/src/Humanizer.Tests/Humanizer.Tests.csproj
+++ b/src/Humanizer.Tests/Humanizer.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net48;net5.0;netcoreapp3.1</TargetFrameworks>
     <Deterministic>false</Deterministic> <!-- Approver doesn't support this yet -->
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' ">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' ">
     <DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>