From a0101cd8e22cfbd392cfea7eb0aee97d34a401f0 Mon Sep 17 00:00:00 2001
From: Rishat Gildanov <grishat@gmail.com>
Date: Wed, 12 Feb 2020 10:45:38 +0500
Subject: [PATCH] Upgrade to Net Core 3.1 and .Net Standart 2.1

---
 src/Irony.Interpreter/Irony.Interpreter.csproj |  2 +-
 src/Irony.SampleApp/Irony.SampleApp.csproj     |  2 +-
 src/Irony.SampleApp/Program.cs                 |  1 +
 src/Irony.Tests/Irony.Tests.csproj             | 11 +++++++----
 src/Irony/Irony.csproj                         |  6 +++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Irony.Interpreter/Irony.Interpreter.csproj b/src/Irony.Interpreter/Irony.Interpreter.csproj
index cb0722f..098c5ed 100644
--- a/src/Irony.Interpreter/Irony.Interpreter.csproj
+++ b/src/Irony.Interpreter/Irony.Interpreter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageId>Irony.Interpreter.NetCore</PackageId>
     <Version>0.999.0</Version>
     <Authors>daxnet</Authors>
diff --git a/src/Irony.SampleApp/Irony.SampleApp.csproj b/src/Irony.SampleApp/Irony.SampleApp.csproj
index 8f95856..c3c7948 100644
--- a/src/Irony.SampleApp/Irony.SampleApp.csproj
+++ b/src/Irony.SampleApp/Irony.SampleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Irony.SampleApp/Program.cs b/src/Irony.SampleApp/Program.cs
index 2cba914..de00306 100644
--- a/src/Irony.SampleApp/Program.cs
+++ b/src/Irony.SampleApp/Program.cs
@@ -10,6 +10,7 @@ static void Main(string[] args)
             var evaluator = new Evaluator();
             var evaluation = evaluator.Evaluate("2.5+(3-1)*5");
             Console.WriteLine(evaluation.Value);
+            Console.ReadKey();
         }
     }
 }
diff --git a/src/Irony.Tests/Irony.Tests.csproj b/src/Irony.Tests/Irony.Tests.csproj
index c6bd049..70f7982 100644
--- a/src/Irony.Tests/Irony.Tests.csproj
+++ b/src/Irony.Tests/Irony.Tests.csproj
@@ -1,15 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Irony/Irony.csproj b/src/Irony/Irony.csproj
index 31fcb6c..ac2a135 100644
--- a/src/Irony/Irony.csproj
+++ b/src/Irony/Irony.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageId>Irony.NetCore</PackageId>
     <Version>0.999.0</Version>
     <Authors>daxnet</Authors>
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>