Version 3.15.0

Taritsyn · Taritsyn · commit 1982c62a028c · 2021-11-28T20:52:58.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 ==========
 
+## v3.15.0 - November 28, 2021
+ * In JavaScriptEngineSwitcher.Node:
+   * Jering.Javascript.NodeJS was updated to version 6.2.0
+   * Added support of .NET Core App 3.1 and .NET 5.0
+
 ## v3.14.0 - November 23, 2021
  * In JavaScriptEngineSwitcher.Jint added support of Jint version 3.0.0 Beta 2036
  * In JavaScriptEngineSwitcher.NiL:
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ This library can be installed through NuGet:
  * [JS Engine Switcher: Jurassic](http://nuget.org/packages/JavaScriptEngineSwitcher.Jurassic) (supports .NET Framework 4.0 Client, .NET Framework 4.5 and .NET Standard 2.0)
  * [JS Engine Switcher: MSIE](http://nuget.org/packages/JavaScriptEngineSwitcher.Msie) (supports .NET Framework 4.0 Client, .NET Framework 4.5, .NET Standard 1.3 and .NET Standard 2.0)
  * [JS Engine Switcher: NiL](http://nuget.org/packages/JavaScriptEngineSwitcher.NiL) (supports .NET Framework 4.6.1, .NET Framework 4.8, .NET Standard 1.3, .NET Standard 1.6, .NET Standard 2.0, .NET Core App 3.1, .NET 5.0 and .NET 6.0)
- * [JS Engine Switcher: Node](http://nuget.org/packages/JavaScriptEngineSwitcher.Node) (supports .NET Framework 4.6.1 and .NET Standard 2.0)
+ * [JS Engine Switcher: Node](http://nuget.org/packages/JavaScriptEngineSwitcher.Node) (supports .NET Framework 4.6.1, .NET Standard 2.0, .NET Core App 3.1 and .NET 5.0)
  * [JS Engine Switcher: V8](http://nuget.org/packages/JavaScriptEngineSwitcher.V8) (supports .NET Framework 4.5, .NET Framework 4.7.1, .NET Standard 2.1, .NET Core App 3.1 and .NET 5.0)
    * [Microsoft ClearScript.V8 for Windows (x86)](https://www.nuget.org/packages/Microsoft.ClearScript.V8.Native.win-x86)
    * [Microsoft ClearScript.V8 for Windows (x64)](https://www.nuget.org/packages/Microsoft.ClearScript.V8.Native.win-x64)
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/Properties/AssemblyInfo.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("39487053-b459-4433-ae93-e00affc653c6")]
 
-[assembly: AssemblyVersion("3.14.0.0")]
-[assembly: AssemblyFileVersion("3.14.0.0")]
+[assembly: AssemblyVersion("3.15.0.0")]
+[assembly: AssemblyFileVersion("3.15.0.0")]
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/package.json b/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsengineswitcher.sample.aspnet4.mvc4",
   "private": true,
-  "version": "3.14.0",
+  "version": "3.15.0",
   "devDependencies": {
     "gulp": "4.0.2",
     "del": "5.1.0",
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Sample ASP.NET Core 1.0 MVC 1 Site</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <RuntimeFrameworkVersion>1.0.16</RuntimeFrameworkVersion>
     <OutputType>Exe</OutputType>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/package.json b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsengineswitcher.sample.aspnetcore1.mvc1",
   "private": true,
-  "version": "3.14.0",
+  "version": "3.15.0",
   "devDependencies": {
     "gulp": "4.0.2",
     "del": "5.1.0",
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Sample ASP.NET Core 1.0 Full MVC 1 Site</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFramework>net451</TargetFramework>
     <OutputType>Exe</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/package.json b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsengineswitcher.sample.aspnetcore1full.mvc1",
   "private": true,
-  "version": "3.14.0",
+  "version": "3.15.0",
   "devDependencies": {
     "gulp": "4.0.2",
     "del": "5.1.0",
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Sample ASP.NET Core 2.1 MVC 2.1 Site</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/package.json b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsengineswitcher.sample.aspnetcore21.mvc21",
   "private": true,
-  "version": "3.14.0",
+  "version": "3.15.0",
   "devDependencies": {
     "gulp": "4.0.2",
     "del": "5.1.0",
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Sample ASP.NET Core 3.1 MVC 3.1 Site</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/package.json b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsengineswitcher.sample.aspnetcore31.mvc31",
   "private": true,
-  "version": "3.14.0",
+  "version": "3.15.0",
   "devDependencies": {
     "gulp": "4.0.2",
     "del": "5.1.0",
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Sample ASP.NET Core 5.0 MVC 5 Site</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/package.json b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/package.json
@@ -1,7 +1,7 @@
 {
   "name": "javascriptengineswitcher.sample.aspnetcore5.mvc5",
   "private": true,
-  "version": "3.14.0",
+  "version": "3.15.0",
   "devDependencies": {
     "gulp": "4.0.2",
     "del": "5.1.0",
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6/JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6/JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Sample ASP.NET Core 6.0 MVC 6 Site</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <OutputType>Exe</OutputType>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6/package.json b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6/package.json
@@ -1,7 +1,7 @@
 {
   "name": "javascriptengineswitcher.sample.aspnetcore6.mvc6",
   "private": true,
-  "version": "3.14.0",
+  "version": "3.15.0",
   "devDependencies": {
     "gulp": "4.0.2",
     "del": "5.1.0",
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj b/samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Logic for Samples</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFrameworks>net40;net451;net471;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
     <OutputType>Library</OutputType>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj b/samples/JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Resources for Samples</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFrameworks>net40-client;net45;net471;netstandard1.3;netstandard2.0</TargetFrameworks>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
     <OutputType>Library</OutputType>
diff --git a/src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj b/src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Node</Product>
-    <VersionPrefix>3.10.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/JavaScriptEngineSwitcher.Node/NodeJsEngine.cs b/src/JavaScriptEngineSwitcher.Node/NodeJsEngine.cs
@@ -368,7 +368,8 @@ private static ErrorLocationItem[] FilterErrorLocationItems(ErrorLocationItem[]
 				string documentName = item.DocumentName;
 				string functionName = item.FunctionName;
 
-				if (documentName == "vm.js"
+				if (documentName == "node:vm"
+					|| documentName == "vm.js"
 					|| documentName == GENERATED_FUNCTION_CALL_FILE_NAME
 					|| (documentName == "anonymous" && functionName == "callFunction"))
 				{
diff --git a/src/JavaScriptEngineSwitcher.Node/readme.txt b/src/JavaScriptEngineSwitcher.Node/readme.txt
@@ -1,7 +1,7 @@
 ﻿
 
    --------------------------------------------------------------------------------
-                    README file for JS Engine Switcher: Node v3.10.0
+                    README file for JS Engine Switcher: Node v3.15.0
 
    --------------------------------------------------------------------------------
 
diff --git a/test/JavaScriptEngineSwitcher.Benchmarks/JavaScriptEngineSwitcher.Benchmarks.csproj b/test/JavaScriptEngineSwitcher.Benchmarks/JavaScriptEngineSwitcher.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Benchmarks</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj b/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>JS Engine Switcher: Tests</Product>
-    <VersionPrefix>3.14.0</VersionPrefix>
+    <VersionPrefix>3.15.0</VersionPrefix>
     <TargetFrameworks>net452;net471;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jsengineswitcher.sample.aspnet4.mvc4",`
`3`	`3`	`"private": true,`
`4`		`- "version": "3.14.0",`
	`4`	`+ "version": "3.15.0",`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"gulp": "4.0.2",`
`7`	`7`	`"del": "5.1.0",`