Skip to content

Commit 0412a32

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.NiL:
 1. NiL.JS was updated to version 2.6.1721; 2. Added support for .NET Standard 2.1.
1 parent 1161484 commit 0412a32

17 files changed

+23
-71
lines changed

‎src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: NiL</Product>
55
<VersionPrefix>3.32.0</VersionPrefix>
6-
<TargetFrameworks>net461;net48;net8.0;net9.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net461;net48;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -22,14 +22,13 @@
2222
<PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_NiL_Logo128x128.png</PackageIconFullPath>
2323
<Description>JavaScriptEngineSwitcher.NiL contains a `NiLJsEngine` adapter (wrapper for the NiL.JS).</Description>
2424
<PackageTags>$(PackageCommonTags);NiL</PackageTags>
25-
<PackageReleaseNotes>1. NiL.JS was updated to version 2.6.1714;
26-
2. No longer supports a .NET Core App 3.1 and .NET 6;
27-
3. Added support for .NET 10.</PackageReleaseNotes>
25+
<PackageReleaseNotes>1. NiL.JS was updated to version 2.6.1721;
26+
2. Added support for .NET Standard 2.1.</PackageReleaseNotes>
2827
</PropertyGroup>
2928

3029
<ItemGroup>
3130
<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
32-
<PackageReference Include="NiL.JS" Version="2.6.1714" />
31+
<PackageReference Include="NiL.JS" Version="2.6.1721" />
3332
</ItemGroup>
3433

3534
<ItemGroup>

‎src/JavaScriptEngineSwitcher.NiL/NiLJsEngine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public sealed class NiLJsEngine : JsEngineBase
4646
/// <summary>
4747
/// Version of original JS engine
4848
/// </summary>
49-
private const string EngineVersion = "2.6.1714";
49+
private const string EngineVersion = "2.6.1721";
5050

5151
/// <summary>
5252
/// Regular expression for working with the syntax error message

‎src/JavaScriptEngineSwitcher.NiL/PACKAGE-DESCRIPTION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
JavaScriptEngineSwitcher.NiL contains a `NiLJsEngine` adapter (wrapper for the [NiL.JS](https://github.com/nilproject/NiL.JS) version 2.6.1714).
1+
JavaScriptEngineSwitcher.NiL contains a `NiLJsEngine` adapter (wrapper for the [NiL.JS](https://github.com/nilproject/NiL.JS) version 2.6.1721).

‎src/JavaScriptEngineSwitcher.NiL/readme.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
DESCRIPTION
1313
===========
1414
JavaScriptEngineSwitcher.NiL contains a `NiLJsEngine` adapter (wrapper for the
15-
NiL.JS (https://github.com/nilproject/NiL.JS) version 2.6.1714).
15+
NiL.JS (https://github.com/nilproject/NiL.JS) version 2.6.1721).
1616

1717
=============
1818
RELEASE NOTES
1919
=============
20-
1. NiL.JS was updated to version 2.6.1714;
21-
2. No longer supports a .NET Core App 3.1 and .NET 6;
22-
3. Added support for .NET 10.
20+
1. NiL.JS was updated to version 2.6.1721;
21+
2. Added support for .NET Standard 2.1.
2322

2423
=============
2524
DOCUMENTATION

‎test/JavaScriptEngineSwitcher.Benchmarks/HostObjectsEmbeddingBenchmark.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NIL_JS
1413
using JavaScriptEngineSwitcher.NiL;
15-
#endif
1614
using JavaScriptEngineSwitcher.V8;
1715

1816
using JavaScriptEngineSwitcher.Benchmarks.Interop.ObjectsEmbedding;
@@ -161,15 +159,13 @@ public void MsieChakraEdgeJsRt()
161159
});
162160
EmbedAndUseHostObjects(createJsEngine);
163161
}
164-
#if NIL_JS
165162

166163
[Benchmark]
167164
public void NiL()
168165
{
169166
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
170167
EmbedAndUseHostObjects(createJsEngine);
171168
}
172-
#endif
173169

174170
[Benchmark]
175171
[Arguments(false)]

‎test/JavaScriptEngineSwitcher.Benchmarks/HostTypesEmbeddingBenchmark.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NIL_JS
1413
using JavaScriptEngineSwitcher.NiL;
15-
#endif
1614
using JavaScriptEngineSwitcher.V8;
1715

1816
using JavaScriptEngineSwitcher.Benchmarks.Interop.TypesEmbedding;
@@ -141,15 +139,13 @@ public void MsieChakraEdgeJsRt()
141139
});
142140
EmbedAndUseHostTypes(createJsEngine);
143141
}
144-
#if NIL_JS
145142

146143
[Benchmark]
147144
public void NiL()
148145
{
149146
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
150147
EmbedAndUseHostTypes(createJsEngine);
151148
}
152-
#endif
153149

154150
[Benchmark]
155151
[Arguments(false)]

‎test/JavaScriptEngineSwitcher.Benchmarks/JavaScriptEngineSwitcher.Benchmarks.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515

1616
<Import Project="../../build/common.props" />
1717

18-
<PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' And '$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'net7.0' ">
19-
<DefineConstants>$(DefineConstants);NIL_JS</DefineConstants>
20-
</PropertyGroup>
21-
2218
<ItemGroup>
2319
<PackageReference Include="BenchmarkDotNet" VersionOverride="0.15.8" />
2420
<PackageReference Include="BuildBundlerMinifier" VersionOverride="3.2.449" PrivateAssets="All" />
@@ -35,16 +31,13 @@
3531
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
3632
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
3733
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
34+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
3835
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
3936
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
4037
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
4138
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
4239
</ItemGroup>
4340

44-
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' And '$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'net7.0' ">
45-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
46-
</ItemGroup>
47-
4841
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
4942
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
5043
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />

‎test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionHeavyBenchmark.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NIL_JS
1413
using JavaScriptEngineSwitcher.NiL;
15-
#endif
1614
using JavaScriptEngineSwitcher.Node;
1715
using JavaScriptEngineSwitcher.V8;
1816
using JavaScriptEngineSwitcher.Vroom;
@@ -224,15 +222,13 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
224222
});
225223
RenderTemplates(createJsEngine, withPrecompilation);
226224
}
227-
#if NIL_JS
228225

229226
[Benchmark]
230227
public void NiL()
231228
{
232229
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
233230
RenderTemplates(createJsEngine, false);
234231
}
235-
#endif
236232

237233
[Benchmark]
238234
public void Node()

‎test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionLightBenchmark.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NIL_JS
1413
using JavaScriptEngineSwitcher.NiL;
15-
#endif
1614
using JavaScriptEngineSwitcher.Node;
1715
using JavaScriptEngineSwitcher.V8;
1816
using JavaScriptEngineSwitcher.Vroom;
@@ -258,15 +256,13 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
258256
});
259257
TransliterateStrings(createJsEngine, withPrecompilation);
260258
}
261-
#if NIL_JS
262259

263260
[Benchmark]
264261
public void NiL()
265262
{
266263
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
267264
TransliterateStrings(createJsEngine, false);
268265
}
269-
#endif
270266

271267
[Benchmark]
272268
public void Node()

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
<Import Project="../../build/common.props" />
1818

19-
<PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' And '$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'net7.0' ">
20-
<DefineConstants>$(DefineConstants);NIL_JS</DefineConstants>
21-
</PropertyGroup>
22-
2319
<ItemGroup>
2420
<PackageReference Include="xunit" VersionOverride="2.9.3" />
2521
<PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.13.0" />
@@ -36,6 +32,7 @@
3632
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
3733
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
3834
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
35+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
3936
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
4037
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
4138
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
@@ -54,10 +51,6 @@
5451
<PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.8.2" />
5552
</ItemGroup>
5653

57-
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' And '$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'net7.0' ">
58-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
59-
</ItemGroup>
60-
6154
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net471' ">
6255
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
6356
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />

0 commit comments

Comments
 (0)