In JavaScriptEngineSwitcher.Node:

Taritsyn · Taritsyn · commit 8057868758c8 · 2023-04-18T20:18:07.000+03:00
1. Jering.Javascript.NodeJS was updated to version 7.0.0 Beta 4;
	2. Added support of .NET 7.
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj b/samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj
@@ -44,11 +44,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.15" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.16" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" Version="7.0.4" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" Version="7.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/JavaScriptEngineSwitcher.Node/DefaultNodeJsService.cs b/src/JavaScriptEngineSwitcher.Node/DefaultNodeJsService.cs
@@ -98,7 +98,7 @@ public Task<bool> TryInvokeFromCacheAsync(string moduleCacheIdentifier, string e
 			return StaticNodeJSService.TryInvokeFromCacheAsync(moduleCacheIdentifier, exportName, args, cancellationToken);
 		}
 
-		public void MoveToNewProcess()
+		public ValueTask MoveToNewProcessAsync()
 		{
 			throw new NotSupportedException();
 		}
diff --git a/src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj b/src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <Product>JS Engine Switcher: Node</Product>
     <VersionPrefix>3.21.0</VersionPrefix>
-    <TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;NU5104</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -18,15 +18,17 @@
   <Import Project="../../build/nuget-for-dotnet-lib.props" />
 
   <PropertyGroup>
-    <Description>JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS) version 6.3.1).
+    <Description>JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS) version 7.0.0 Beta 4).
 
 This package does not contain the `node.exe`. Therefore, you need to install the Node.js (https://nodejs.org) and add the `node.exe`'s directory to the `Path` environment variable (automatically done by the official installer).</Description>
     <PackageTags>$(PackageCommonTags);Node.js;Jering.Javascript.NodeJS</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Node_Logo128x128.png</PackageIconFullPath>
+    <PackageReleaseNotes>1. Jering.Javascript.NodeJS was updated to version 7.0.0 Beta 4;
+2. Added support of .NET 7.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jering.Javascript.NodeJS" Version="6.3.1" />
+    <PackageReference Include="Jering.Javascript.NodeJS" Version="7.0.0-beta.4" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>
diff --git a/src/JavaScriptEngineSwitcher.Node/readme.txt b/src/JavaScriptEngineSwitcher.Node/readme.txt
@@ -13,12 +13,18 @@
    ===========
    JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the
    Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS)
-   version 6.3.1).
+   version 7.0.0 Beta 4).
 
    This package does not contain the `node.exe`. Therefore, you need to install the
    Node.js (https://nodejs.org) and add the `node.exe`'s directory to the `Path`
    environment variable (automatically done by the official installer).
 
+   =============
+   RELEASE NOTES
+   =============
+   1. Jering.Javascript.NodeJS was updated to version 7.0.0 Beta 4;
+   2. Added support of .NET 7.
+
    =============
    DOCUMENTATION
    =============
diff --git a/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj b/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj
@@ -85,11 +85,11 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net452' ">
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
-    <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'netcoreapp2.1' ">
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
+    <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
   </ItemGroup>
 
diff --git a/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs b/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs
@@ -12,8 +12,6 @@
 using JavaScriptEngineSwitcher.Msie;
 #if NET471 || NETCOREAPP3_1_OR_GREATER
 using JavaScriptEngineSwitcher.NiL;
-#endif
-#if !NET452
 using JavaScriptEngineSwitcher.Node;
 #endif
 #if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
@@ -51,8 +49,6 @@ public static void Initialize()
 					})
 #if NET471 || NETCOREAPP3_1_OR_GREATER
 					.AddNiL()
-#endif
-#if !NET452
 					.AddNode()
 #endif
 #if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/BuiltInLibraryTests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/BuiltInLibraryTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 using Xunit;
 
 using JavaScriptEngineSwitcher.Node;
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/CommonTests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/CommonTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 using System;
 
 using Xunit;
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/Es2015Tests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/Es2015Tests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 namespace JavaScriptEngineSwitcher.Tests.Node
 {
 	public class Es2015Tests : Es2015TestsBase
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/Es5Tests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/Es5Tests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 namespace JavaScriptEngineSwitcher.Tests.Node
 {
 	public class Es5Tests : Es5TestsBase
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/EvalTests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/EvalTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 namespace JavaScriptEngineSwitcher.Tests.Node
 {
 	public class EvalTests : EvalTestsBase
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/MultithreadingTests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/MultithreadingTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 namespace JavaScriptEngineSwitcher.Tests.Node
 {
 	public class MultithreadingTests : MultithreadingTestsBase
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/PrecompilationTests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/PrecompilationTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 namespace JavaScriptEngineSwitcher.Tests.Node
 {
 	public class PrecompilationTests : PrecompilationTestsBase
diff --git a/test/JavaScriptEngineSwitcher.Tests/Node/SecurityTests.cs b/test/JavaScriptEngineSwitcher.Tests/Node/SecurityTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NET452
+﻿#if NET471 || NETCOREAPP3_1_OR_GREATER
 using Xunit;
 
 namespace JavaScriptEngineSwitcher.Tests.Node

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public Task<bool> TryInvokeFromCacheAsync(string moduleCacheIdentifier, string e`
`98`	`98`	`return StaticNodeJSService.TryInvokeFromCacheAsync(moduleCacheIdentifier, exportName, args, cancellationToken);`
`99`	`99`	`}`
`100`	`100`
`101`		`- public void MoveToNewProcess()`
	`101`	`+ public ValueTask MoveToNewProcessAsync()`
`102`	`102`	`{`
`103`	`103`	`throw new NotSupportedException();`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if !NET452`
	`1`	`+#if NET471 \|\| NETCOREAPP3_1_OR_GREATER`
`2`	`2`	`using Xunit;`
`3`	`3`
`4`	`4`	`using JavaScriptEngineSwitcher.Node;`