diff --git a/.gitignore b/.gitignore
index 811a55e7..0d4e6652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# Visual Studio
+.vs/
+# JetBrains Rider
+.idea/
 /build/
 *.suo
 *.user
diff --git a/.vs/RazorEngine.NetCore/DesignTimeBuild/.dtbcache b/.vs/RazorEngine.NetCore/DesignTimeBuild/.dtbcache
deleted file mode 100644
index c1ec7c45..00000000
Binary files a/.vs/RazorEngine.NetCore/DesignTimeBuild/.dtbcache and /dev/null differ
diff --git a/.vs/RazorEngine.NetCore/DesignTimeBuild/.dtbcache.v2 b/.vs/RazorEngine.NetCore/DesignTimeBuild/.dtbcache.v2
deleted file mode 100644
index 9717bb2b..00000000
Binary files a/.vs/RazorEngine.NetCore/DesignTimeBuild/.dtbcache.v2 and /dev/null differ
diff --git a/.vs/RazorEngine.NetCore/v15/Server/sqlite3/db.lock b/.vs/RazorEngine.NetCore/v15/Server/sqlite3/db.lock
deleted file mode 100644
index e69de29b..00000000
diff --git a/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide b/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide
deleted file mode 100644
index aa0b8b29..00000000
Binary files a/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide and /dev/null differ
diff --git a/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide-shm b/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide-shm
deleted file mode 100644
index bc2b0727..00000000
Binary files a/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide-shm and /dev/null differ
diff --git a/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide-wal b/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide-wal
deleted file mode 100644
index 4868e09d..00000000
Binary files a/.vs/RazorEngine.NetCore/v15/Server/sqlite3/storage.ide-wal and /dev/null differ
diff --git a/.vs/RazorEngine.NetCore/v16/Server/sqlite3/db.lock b/.vs/RazorEngine.NetCore/v16/Server/sqlite3/db.lock
deleted file mode 100644
index e69de29b..00000000
diff --git a/.vs/RazorEngine.NetCore/v16/Server/sqlite3/storage.ide b/.vs/RazorEngine.NetCore/v16/Server/sqlite3/storage.ide
deleted file mode 100644
index 7cd22698..00000000
Binary files a/.vs/RazorEngine.NetCore/v16/Server/sqlite3/storage.ide and /dev/null differ
diff --git a/RazorEngine.NetCore/RazorEngine.NetCore.csproj b/RazorEngine.NetCore/RazorEngine.NetCore.csproj
index 9fc8c226..f5484144 100644
--- a/RazorEngine.NetCore/RazorEngine.NetCore.csproj
+++ b/RazorEngine.NetCore/RazorEngine.NetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <DefineConstants>$(DefineConstants);RAZOR4</DefineConstants>
     <DefineConstants>$(DefineConstants);NO_APPDOMAIN;NO_CODEDOM;NO_CONFIGURATION;NETCORE</DefineConstants>
   </PropertyGroup>
@@ -31,11 +31,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="3.1.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" Condition="'$(TargetFramework)' != 'netcoreapp3.1'" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.2.0" Condition="'$(TargetFramework)' != 'netcoreapp3.1'" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="2.2.0" Condition="'$(TargetFramework)' != 'netcoreapp3.1'" />
-
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="3.1.5" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/RazorEngine.NetCore/Templating/RazorTemplateEngine.cs b/RazorEngine.NetCore/Templating/RazorTemplateEngine.cs
index d6dc5c11..9310ad40 100644
--- a/RazorEngine.NetCore/Templating/RazorTemplateEngine.cs
+++ b/RazorEngine.NetCore/Templating/RazorTemplateEngine.cs
@@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NETCOREAPP3_1
 namespace Microsoft.AspNetCore.Razor.Language
 {
     using System;
@@ -221,5 +220,4 @@ public virtual IEnumerable<RazorProjectItem> GetImportItems(RazorProjectItem pro
             return Enumerable.Empty<RazorProjectItem>();
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/RazorEngine.NetCore/Templating/RazorTemplateEngineOptions.cs b/RazorEngine.NetCore/Templating/RazorTemplateEngineOptions.cs
index 05bef18d..d01de2e2 100644
--- a/RazorEngine.NetCore/Templating/RazorTemplateEngineOptions.cs
+++ b/RazorEngine.NetCore/Templating/RazorTemplateEngineOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NETCOREAPP3_1
 namespace Microsoft.AspNetCore.Razor.Language
 {
     /// <summary>
@@ -18,5 +17,4 @@ public sealed class RazorTemplateEngineOptions
         /// </summary>
         public RazorSourceDocument DefaultImports { get; set; }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Test/Program.cs b/Test/Program.cs
index 2a646b0f..be572401 100644
--- a/Test/Program.cs
+++ b/Test/Program.cs
@@ -8,9 +8,25 @@ class Program
     {
         static void Main(string[] args)
         {
-            string template = "Hello @Model.Name, welcome to RazorEngine!";
+            string template = @"
+@{
+    void test(int value)
+    {
+        for(var i=0; i<=value; i++)
+        {
+            <div>test: @i</div>
+        }
+    }    
+}
+
+Hello @Model.Name, 
+welcome to RazorEngine!
+
+Function with razor:
+@{ test(5); }";
+
             var result = Engine.Razor.RunCompile(template, "templateKey", null, new { Name = "World" });
-            Console.WriteLine("Hello World!");
+            Console.WriteLine(result);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Test/Test.csproj b/Test/Test.csproj
index de6d7b9a..89450d76 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.2"/>
     <ProjectReference Include="..\RazorEngine.NetCore\RazorEngine.NetCore.csproj" />
   </ItemGroup>