From 366b7f17226d3a4c4669950be96a33b6b780166a Mon Sep 17 00:00:00 2001
From: avk <Andrew.Kostousov@gmail.com>
Date: Wed, 10 Mar 2021 11:38:50 +0500
Subject: [PATCH] add net5.0 and drop netcoreapp2.x support

---
 .travis.yml                      | 2 +-
 CHANGELOG.md                     | 4 ++++
 GrEmit.Tests/GrEmit.Tests.csproj | 8 ++++----
 GrEmit/GrEmit.csproj             | 3 +--
 global.json                      | 2 +-
 test-by-travis.sh                | 4 ++--
 version.json                     | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c311fd3..93dd870 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 dist: xenial
 sudo: false
 language: csharp
-dotnet: 3.1.200
+dotnet: 5.0.103
 matrix:
   include:
     - mono: none
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bce4188..f4c86ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.4.x - 2021.03.10
+- Add net5.0 support
+- Drop netcoreapp2.x support
+
 ## v3.3.20 - 2021.02.25
 - Adding MIT license file to nuget package
 
diff --git a/GrEmit.Tests/GrEmit.Tests.csproj b/GrEmit.Tests/GrEmit.Tests.csproj
index 215f5ed..51854aa 100644
--- a/GrEmit.Tests/GrEmit.Tests.csproj
+++ b/GrEmit.Tests/GrEmit.Tests.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net45;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/GrEmit/GrEmit.csproj b/GrEmit/GrEmit.csproj
index 2d72a6e..f7ad04c 100644
--- a/GrEmit/GrEmit.csproj
+++ b/GrEmit/GrEmit.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- todo (andrew, 21.02.2019): switch netcoreapp2.x targets to netstandard2.1 target when it will be released (see https://devblogs.microsoft.com/dotnet/announcing-net-standard-2-1/) -->
-    <TargetFrameworks>net45;netstandard2.0;netcoreapp2.1;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;netstandard2.1</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
diff --git a/global.json b/global.json
index cc4d115..8c50959 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.200"
+    "version": "5.0.103"
   }
 }
\ No newline at end of file
diff --git a/test-by-travis.sh b/test-by-travis.sh
index 6a845ad..c237956 100755
--- a/test-by-travis.sh
+++ b/test-by-travis.sh
@@ -6,8 +6,8 @@ if [ ${DOTNETCORE} -eq 1 ]
 then
   dotnet restore ./GrEmit.sln --verbosity m
   dotnet build --configuration Release --framework netstandard2.0 ./GrEmit/GrEmit.csproj
-  dotnet build --configuration Release --framework netcoreapp3.1 ./GrEmit.Tests/GrEmit.Tests.csproj
-  dotnet test --no-build --configuration Release --framework netcoreapp3.1 ./GrEmit.Tests/GrEmit.Tests.csproj
+  dotnet build --configuration Release --framework net5.0 ./GrEmit.Tests/GrEmit.Tests.csproj
+  dotnet test --no-build --configuration Release --framework net5.0 ./GrEmit.Tests/GrEmit.Tests.csproj
 else
   nuget install NUnit.ConsoleRunner -Version 3.9.0 -OutputDirectory testrunner
   msbuild /t:Restore ./GrEmit.sln
diff --git a/version.json b/version.json
index 94bd664..b94c411 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.3",
+  "version": "3.4",
   "assemblyVersion": {
     "precision": "build"
   },