Skip to content

Commit 8057868

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.Node:
 1. Jering.Javascript.NodeJS was updated to version 7.0.0 Beta 4; 2. Added support of .NET 7.
1 parent 053387d commit 8057868

File tree

14 files changed

+25
-21
lines changed

14 files changed

+25
-21
lines changed

‎samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
</ItemGroup>
4545

4646
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
47-
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.15" />
47+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.16" />
4848
</ItemGroup>
4949

5050
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
51-
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="7.0.4" />
51+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="7.0.5" />
5252
</ItemGroup>
5353

5454
</Project>

‎src/JavaScriptEngineSwitcher.Node/DefaultNodeJsService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public Task<bool> TryInvokeFromCacheAsync(string moduleCacheIdentifier, string e
9898
return StaticNodeJSService.TryInvokeFromCacheAsync(moduleCacheIdentifier, exportName, args, cancellationToken);
9999
}
100100

101-
public void MoveToNewProcess()
101+
public ValueTask MoveToNewProcessAsync()
102102
{
103103
throw new NotSupportedException();
104104
}

‎src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: Node</Product>
55
<VersionPrefix>3.21.0</VersionPrefix>
6-
<TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10-
<NoWarn>$(NoWarn);CS1591</NoWarn>
10+
<NoWarn>$(NoWarn);CS1591;NU5104</NoWarn>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
1313
<CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -18,15 +18,17 @@
1818
<Import Project="../../build/nuget-for-dotnet-lib.props" />
1919

2020
<PropertyGroup>
21-
<Description>JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS) version 6.3.1).
21+
<Description>JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS) version 7.0.0 Beta 4).
2222

2323
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>
2424
<PackageTags>$(PackageCommonTags);Node.js;Jering.Javascript.NodeJS</PackageTags>
2525
<PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Node_Logo128x128.png</PackageIconFullPath>
26+
<PackageReleaseNotes>1. Jering.Javascript.NodeJS was updated to version 7.0.0 Beta 4;
27+
2. Added support of .NET 7.</PackageReleaseNotes>
2628
</PropertyGroup>
2729

2830
<ItemGroup>
29-
<PackageReference Include="Jering.Javascript.NodeJS" Version="6.3.1" />
31+
<PackageReference Include="Jering.Javascript.NodeJS" Version="7.0.0-beta.4" />
3032

3133
<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
3234
</ItemGroup>

‎src/JavaScriptEngineSwitcher.Node/readme.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@
1313
===========
1414
JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the
1515
Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS)
16-
version 6.3.1).
16+
version 7.0.0 Beta 4).
1717

1818
This package does not contain the `node.exe`. Therefore, you need to install the
1919
Node.js (https://nodejs.org) and add the `node.exe`'s directory to the `Path`
2020
environment variable (automatically done by the official installer).
2121

22+
=============
23+
RELEASE NOTES
24+
=============
25+
1. Jering.Javascript.NodeJS was updated to version 7.0.0 Beta 4;
26+
2. Added support of .NET 7.
27+
2228
=============
2329
DOCUMENTATION
2430
=============

‎test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@
8585

8686
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' ">
8787
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
88-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
8988
</ItemGroup>
9089

9190
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'netcoreapp2.1' ">
9291
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
92+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
9393
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
9494
</ItemGroup>
9595

‎test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
using JavaScriptEngineSwitcher.Msie;
1313
#if NET471 || NETCOREAPP3_1_OR_GREATER
1414
using JavaScriptEngineSwitcher.NiL;
15-
#endif
16-
#if !NET452
1715
using JavaScriptEngineSwitcher.Node;
1816
#endif
1917
#if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
@@ -51,8 +49,6 @@ public static void Initialize()
5149
})
5250
#if NET471 || NETCOREAPP3_1_OR_GREATER
5351
.AddNiL()
54-
#endif
55-
#if !NET452
5652
.AddNode()
5753
#endif
5854
#if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER

‎test/JavaScriptEngineSwitcher.Tests/Node/BuiltInLibraryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NET452
1+
#if NET471 || NETCOREAPP3_1_OR_GREATER
22
using Xunit;
33

44
using JavaScriptEngineSwitcher.Node;

‎test/JavaScriptEngineSwitcher.Tests/Node/CommonTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NET452
1+
#if NET471 || NETCOREAPP3_1_OR_GREATER
22
using System;
33

44
using Xunit;

‎test/JavaScriptEngineSwitcher.Tests/Node/Es2015Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NET452
1+
#if NET471 || NETCOREAPP3_1_OR_GREATER
22
namespace JavaScriptEngineSwitcher.Tests.Node
33
{
44
public class Es2015Tests : Es2015TestsBase

‎test/JavaScriptEngineSwitcher.Tests/Node/Es5Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NET452
1+
#if NET471 || NETCOREAPP3_1_OR_GREATER
22
namespace JavaScriptEngineSwitcher.Tests.Node
33
{
44
public class Es5Tests : Es5TestsBase

0 commit comments

Comments
 (0)