diff --git a/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_nightly.yml b/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_nightly.yml
index 07f5e05..fd06be0 100644
--- a/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_nightly.yml
+++ b/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_nightly.yml
@@ -29,6 +29,11 @@ variables:
 
 steps:
 
+- task: UseDotNet@2
+  displayName: 'Use .NET 5'
+  inputs:
+    version: 5.x
+
 - task: PoliCheck@1
   displayName: 'Run PoliCheck "OpenApi.OData-master\src"'
   inputs:
diff --git a/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_rolling.yml b/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_rolling.yml
index 4bf2bd3..ff074a9 100644
--- a/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_rolling.yml
+++ b/.github/ISSUE_TEMPLATE/workflows/azure-pipelines_rolling.yml
@@ -27,6 +27,11 @@ variables:
 
 steps:
 
+- task: UseDotNet@2
+  displayName: 'Use .NET 5'
+  inputs:
+    version: 5.x
+
 - task: PoliCheck@1
   displayName: 'Run PoliCheck ".\src"'
   inputs:
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj b/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
index d24893f..3b88390 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AssemblyName>Microsoft.OpenApi.OData.Reader.Tests</AssemblyName>
     <RootNamespace>Microsoft.OpenApi.OData.Reader.Tests</RootNamespace>
-    <TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net472;net5.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\tool\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <DelaySign>true</DelaySign>