Skip to content

Commit 1ceb4c7

Browse files
committed
In JavaScriptEngineSwitcher.NiL:
1. NiL.JS was updated to version 2.5.1591; 2. No longer supports a .NET Standard.
1 parent 330e87b commit 1ceb4c7

15 files changed

+60
-21
lines changed

src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: NiL</Product>
55
<VersionPrefix>3.19.0</VersionPrefix>
6-
<TargetFrameworks>net461;net48;netstandard1.3;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net461;net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -16,14 +16,16 @@
1616
<Import Project="../../build/nuget-for-dotnet-lib.props" />
1717

1818
<PropertyGroup>
19-
<Description>JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1560).</Description>
19+
<Description>JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1591).</Description>
2020
<PackageTags>$(PackageCommonTags);NiL</PackageTags>
2121
<PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_NiL_Logo128x128.png</PackageIconFullPath>
22+
<PackageReleaseNotes>1. NiL.JS was updated to version 2.5.1591;
23+
2. No longer supports a .NET Standard.</PackageReleaseNotes>
2224
</PropertyGroup>
2325

2426
<ItemGroup>
2527
<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
26-
<PackageReference Include="NiL.JS" Version="2.5.1560" />
28+
<PackageReference Include="NiL.JS" Version="2.5.1591" />
2729
</ItemGroup>
2830

2931
<ItemGroup>

src/JavaScriptEngineSwitcher.NiL/NiLJsEngine.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public sealed class NiLJsEngine : JsEngineBase
3939
/// <summary>
4040
/// Version of original JS engine
4141
/// </summary>
42-
private const string EngineVersion = "2.5.1560";
42+
private const string EngineVersion = "2.5.1591";
4343

4444
/// <summary>
4545
/// Regular expression for working with the syntax error message

src/JavaScriptEngineSwitcher.NiL/readme.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
DESCRIPTION
1313
===========
1414
JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the
15-
NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1560).
15+
NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1591).
16+
17+
=============
18+
RELEASE NOTES
19+
=============
20+
1. NiL.JS was updated to version 2.5.1591;
21+
2. No longer supports a .NET Standard.
1622

1723
=============
1824
DOCUMENTATION

test/JavaScriptEngineSwitcher.Benchmarks/HostObjectsEmbeddingBenchmark.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
using JavaScriptEngineSwitcher.NiL;
1413
#if NET461 || NETCOREAPP3_1_OR_GREATER
14+
using JavaScriptEngineSwitcher.NiL;
1515
using JavaScriptEngineSwitcher.V8;
1616
#endif
1717

@@ -161,14 +161,14 @@ public void MsieChakraEdgeJsRt()
161161
});
162162
EmbedAndUseHostObjects(createJsEngine);
163163
}
164+
#if NET461 || NETCOREAPP3_1_OR_GREATER
164165

165166
[Benchmark]
166167
public void NiL()
167168
{
168169
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
169170
EmbedAndUseHostObjects(createJsEngine);
170171
}
171-
#if NET461 || NETCOREAPP3_1_OR_GREATER
172172

173173
[Benchmark]
174174
public void V8()

test/JavaScriptEngineSwitcher.Benchmarks/HostTypesEmbeddingBenchmark.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
using JavaScriptEngineSwitcher.NiL;
1413
#if NET461 || NETCOREAPP3_1_OR_GREATER
14+
using JavaScriptEngineSwitcher.NiL;
1515
using JavaScriptEngineSwitcher.V8;
1616
#endif
1717

@@ -141,14 +141,14 @@ public void MsieChakraEdgeJsRt()
141141
});
142142
EmbedAndUseHostTypes(createJsEngine);
143143
}
144+
#if NET461 || NETCOREAPP3_1_OR_GREATER
144145

145146
[Benchmark]
146147
public void NiL()
147148
{
148149
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
149150
EmbedAndUseHostTypes(createJsEngine);
150151
}
151-
#if NET461 || NETCOREAPP3_1_OR_GREATER
152152

153153
[Benchmark]
154154
public void V8()

test/JavaScriptEngineSwitcher.Benchmarks/JavaScriptEngineSwitcher.Benchmarks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
2525
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
2626
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
27-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
2827
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
2928
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
3029
</ItemGroup>
@@ -39,6 +38,7 @@
3938
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.3.1" />
4039
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x86" Version="7.3.1" />
4140

41+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
4242
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
4343
</ItemGroup>
4444

test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionHeavyBenchmark.cs

+4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1314
using JavaScriptEngineSwitcher.NiL;
15+
#endif
1416
using JavaScriptEngineSwitcher.Node;
1517
#if NET461 || NETCOREAPP3_1_OR_GREATER
1618
using JavaScriptEngineSwitcher.V8;
@@ -223,13 +225,15 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
223225
});
224226
RenderTemplates(createJsEngine, withPrecompilation);
225227
}
228+
#if NET461 || NETCOREAPP3_1_OR_GREATER
226229

227230
[Benchmark]
228231
public void NiL()
229232
{
230233
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
231234
RenderTemplates(createJsEngine, false);
232235
}
236+
#endif
233237

234238
[Benchmark]
235239
public void Node()

test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionLightBenchmark.cs

+4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1314
using JavaScriptEngineSwitcher.NiL;
15+
#endif
1416
using JavaScriptEngineSwitcher.Node;
1517
#if NET461 || NETCOREAPP3_1_OR_GREATER
1618
using JavaScriptEngineSwitcher.V8;
@@ -257,13 +259,15 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
257259
});
258260
TransliterateStrings(createJsEngine, withPrecompilation);
259261
}
262+
#if NET461 || NETCOREAPP3_1_OR_GREATER
260263

261264
[Benchmark]
262265
public void NiL()
263266
{
264267
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
265268
TransliterateStrings(createJsEngine, false);
266269
}
270+
#endif
267271

268272
[Benchmark]
269273
public void Node()

test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,13 @@
6868

6969
<ItemGroup Condition=" '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
7070
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
71-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
7271
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
7372
</ItemGroup>
7473

74+
<ItemGroup Condition=" '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
75+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
76+
</ItemGroup>
77+
7578
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
7679
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
7780
</ItemGroup>

test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
#endif
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if !NET452
13+
#if NET471 || NETCOREAPP3_1_OR_GREATER
1414
using JavaScriptEngineSwitcher.NiL;
15+
#endif
16+
#if !NET452
1517
using JavaScriptEngineSwitcher.Node;
1618
#endif
1719
#if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
@@ -44,8 +46,10 @@ public static void Initialize()
4446
{
4547
EngineMode = JsEngineMode.ChakraIeJsRt
4648
})
47-
#if !NET452
49+
#if NET471 || NETCOREAPP3_1_OR_GREATER
4850
.AddNiL()
51+
#endif
52+
#if !NET452
4953
.AddNode()
5054
#endif
5155
#if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER

test/JavaScriptEngineSwitcher.Tests/NiL/CommonTests.cs

+7-4
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;
@@ -170,9 +170,12 @@ public void MappingRuntimeErrorDuringExecutionOfCodeIsCorrect()
170170
Assert.Equal("The value must be greater than or equal to zero.", exception.Description);
171171
Assert.Equal("Error", exception.Type);
172172
Assert.Empty(exception.DocumentName);
173-
Assert.Equal(0, exception.LineNumber);
174-
Assert.Equal(0, exception.ColumnNumber);
175-
Assert.Empty(exception.SourceFragment);
173+
Assert.Equal(3, exception.LineNumber);
174+
Assert.Equal(3, exception.ColumnNumber);
175+
Assert.Equal(
176+
" throw new Error(\"The value must be greater than or equal to zero.\");",
177+
exception.SourceFragment
178+
);
176179
Assert.Empty(exception.CallStack);
177180
}
178181

test/JavaScriptEngineSwitcher.Tests/NiL/Es5Tests.cs

+1-1
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.NiL
33
{
44
public class Es5Tests : Es5TestsBase

test/JavaScriptEngineSwitcher.Tests/NiL/InteropTests.cs

+14-1
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;
@@ -13,6 +13,19 @@ protected override string EngineName
1313
}
1414

1515

16+
#region Embedding of objects
17+
18+
#region Delegates
19+
20+
[Fact]
21+
public override void CallingOfEmbeddedDelegateWithMissingParameter()
22+
{ }
23+
24+
#endregion
25+
26+
#endregion
27+
28+
1629
#region Embedding of types
1730

1831
#region Types with methods

test/JavaScriptEngineSwitcher.Tests/NiL/MultithreadingTests.cs

+1-1
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.NiL
33
{
44
public class MultithreadingTests : MultithreadingTestsBase

test/JavaScriptEngineSwitcher.Tests/NiL/PrecompilationTests.cs

+1-1
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.NiL
33
{
44
public class PrecompilationTests : PrecompilationTestsBase

0 commit comments

Comments
 (0)