File tree 15 files changed +60
-21
lines changed
src/JavaScriptEngineSwitcher.NiL
JavaScriptEngineSwitcher.Benchmarks
JavaScriptEngineSwitcher.Tests
15 files changed +60
-21
lines changed Original file line number Diff line number Diff line change 3
3
<PropertyGroup >
4
4
<Product >JS Engine Switcher: NiL</Product >
5
5
<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 >
7
7
<OutputType >Library</OutputType >
8
8
<TreatWarningsAsErrors >true</TreatWarningsAsErrors >
9
9
<NoWarn >$(NoWarn);CS1591</NoWarn >
16
16
<Import Project =" ../../build/nuget-for-dotnet-lib.props" />
17
17
18
18
<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 >
20
20
<PackageTags >$(PackageCommonTags);NiL</PackageTags >
21
21
<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 >
22
24
</PropertyGroup >
23
25
24
26
<ItemGroup >
25
27
<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 " />
27
29
</ItemGroup >
28
30
29
31
<ItemGroup >
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ public sealed class NiLJsEngine : JsEngineBase
39
39
/// <summary>
40
40
/// Version of original JS engine
41
41
/// </summary>
42
- private const string EngineVersion = "2.5.1560 " ;
42
+ private const string EngineVersion = "2.5.1591 " ;
43
43
44
44
/// <summary>
45
45
/// Regular expression for working with the syntax error message
Original file line number Diff line number Diff line change 12
12
DESCRIPTION
13
13
===========
14
14
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.
16
22
17
23
=============
18
24
DOCUMENTATION
Original file line number Diff line number Diff line change 10
10
using JavaScriptEngineSwitcher . Jint ;
11
11
using JavaScriptEngineSwitcher . Jurassic ;
12
12
using JavaScriptEngineSwitcher . Msie ;
13
- using JavaScriptEngineSwitcher . NiL ;
14
13
#if NET461 || NETCOREAPP3_1_OR_GREATER
14
+ using JavaScriptEngineSwitcher . NiL ;
15
15
using JavaScriptEngineSwitcher . V8 ;
16
16
#endif
17
17
@@ -161,14 +161,14 @@ public void MsieChakraEdgeJsRt()
161
161
} ) ;
162
162
EmbedAndUseHostObjects ( createJsEngine ) ;
163
163
}
164
+ #if NET461 || NETCOREAPP3_1_OR_GREATER
164
165
165
166
[ Benchmark ]
166
167
public void NiL ( )
167
168
{
168
169
Func < IJsEngine > createJsEngine = ( ) => new NiLJsEngine ( ) ;
169
170
EmbedAndUseHostObjects ( createJsEngine ) ;
170
171
}
171
- #if NET461 || NETCOREAPP3_1_OR_GREATER
172
172
173
173
[ Benchmark ]
174
174
public void V8 ( )
Original file line number Diff line number Diff line change 10
10
using JavaScriptEngineSwitcher . Jint ;
11
11
using JavaScriptEngineSwitcher . Jurassic ;
12
12
using JavaScriptEngineSwitcher . Msie ;
13
- using JavaScriptEngineSwitcher . NiL ;
14
13
#if NET461 || NETCOREAPP3_1_OR_GREATER
14
+ using JavaScriptEngineSwitcher . NiL ;
15
15
using JavaScriptEngineSwitcher . V8 ;
16
16
#endif
17
17
@@ -141,14 +141,14 @@ public void MsieChakraEdgeJsRt()
141
141
} ) ;
142
142
EmbedAndUseHostTypes ( createJsEngine ) ;
143
143
}
144
+ #if NET461 || NETCOREAPP3_1_OR_GREATER
144
145
145
146
[ Benchmark ]
146
147
public void NiL ( )
147
148
{
148
149
Func < IJsEngine > createJsEngine = ( ) => new NiLJsEngine ( ) ;
149
150
EmbedAndUseHostTypes ( createJsEngine ) ;
150
151
}
151
- #if NET461 || NETCOREAPP3_1_OR_GREATER
152
152
153
153
[ Benchmark ]
154
154
public void V8 ( )
Original file line number Diff line number Diff line change 24
24
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
25
25
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
26
26
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
27
- <ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
28
27
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
29
28
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
30
29
</ItemGroup >
39
38
<PackageReference Include =" Microsoft.ClearScript.V8.Native.win-x64" Version =" 7.3.1" />
40
39
<PackageReference Include =" Microsoft.ClearScript.V8.Native.win-x86" Version =" 7.3.1" />
41
40
41
+ <ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
42
42
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
43
43
</ItemGroup >
44
44
Original file line number Diff line number Diff line change 10
10
using JavaScriptEngineSwitcher . Jint ;
11
11
using JavaScriptEngineSwitcher . Jurassic ;
12
12
using JavaScriptEngineSwitcher . Msie ;
13
+ #if NET461 || NETCOREAPP3_1_OR_GREATER
13
14
using JavaScriptEngineSwitcher . NiL ;
15
+ #endif
14
16
using JavaScriptEngineSwitcher . Node ;
15
17
#if NET461 || NETCOREAPP3_1_OR_GREATER
16
18
using JavaScriptEngineSwitcher . V8 ;
@@ -223,13 +225,15 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
223
225
} ) ;
224
226
RenderTemplates ( createJsEngine , withPrecompilation ) ;
225
227
}
228
+ #if NET461 || NETCOREAPP3_1_OR_GREATER
226
229
227
230
[ Benchmark ]
228
231
public void NiL ( )
229
232
{
230
233
Func < IJsEngine > createJsEngine = ( ) => new NiLJsEngine ( ) ;
231
234
RenderTemplates ( createJsEngine , false ) ;
232
235
}
236
+ #endif
233
237
234
238
[ Benchmark ]
235
239
public void Node ( )
Original file line number Diff line number Diff line change 10
10
using JavaScriptEngineSwitcher . Jint ;
11
11
using JavaScriptEngineSwitcher . Jurassic ;
12
12
using JavaScriptEngineSwitcher . Msie ;
13
+ #if NET461 || NETCOREAPP3_1_OR_GREATER
13
14
using JavaScriptEngineSwitcher . NiL ;
15
+ #endif
14
16
using JavaScriptEngineSwitcher . Node ;
15
17
#if NET461 || NETCOREAPP3_1_OR_GREATER
16
18
using JavaScriptEngineSwitcher . V8 ;
@@ -257,13 +259,15 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
257
259
} ) ;
258
260
TransliterateStrings ( createJsEngine , withPrecompilation ) ;
259
261
}
262
+ #if NET461 || NETCOREAPP3_1_OR_GREATER
260
263
261
264
[ Benchmark ]
262
265
public void NiL ( )
263
266
{
264
267
Func < IJsEngine > createJsEngine = ( ) => new NiLJsEngine ( ) ;
265
268
TransliterateStrings ( createJsEngine , false ) ;
266
269
}
270
+ #endif
267
271
268
272
[ Benchmark ]
269
273
public void Node ( )
Original file line number Diff line number Diff line change 68
68
69
69
<ItemGroup Condition =" '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' " >
70
70
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
71
- <ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
72
71
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
73
72
</ItemGroup >
74
73
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
+
75
78
<ItemGroup Condition =" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' " >
76
79
<ProjectReference Include =" ../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
77
80
</ItemGroup >
Original file line number Diff line number Diff line change 10
10
#endif
11
11
using JavaScriptEngineSwitcher . Jurassic ;
12
12
using JavaScriptEngineSwitcher . Msie ;
13
- #if ! NET452
13
+ #if NET471 || NETCOREAPP3_1_OR_GREATER
14
14
using JavaScriptEngineSwitcher . NiL ;
15
+ #endif
16
+ #if ! NET452
15
17
using JavaScriptEngineSwitcher . Node ;
16
18
#endif
17
19
#if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
@@ -44,8 +46,10 @@ public static void Initialize()
44
46
{
45
47
EngineMode = JsEngineMode . ChakraIeJsRt
46
48
} )
47
- #if ! NET452
49
+ #if NET471 || NETCOREAPP3_1_OR_GREATER
48
50
. AddNiL ( )
51
+ #endif
52
+ #if ! NET452
49
53
. AddNode ( )
50
54
#endif
51
55
#if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
Original file line number Diff line number Diff line change 1
- #if ! NET452
1
+ #if NET471 || NETCOREAPP3_1_OR_GREATER
2
2
using System ;
3
3
4
4
using Xunit ;
@@ -170,9 +170,12 @@ public void MappingRuntimeErrorDuringExecutionOfCodeIsCorrect()
170
170
Assert . Equal ( "The value must be greater than or equal to zero." , exception . Description ) ;
171
171
Assert . Equal ( "Error" , exception . Type ) ;
172
172
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
+ ) ;
176
179
Assert . Empty ( exception . CallStack ) ;
177
180
}
178
181
Original file line number Diff line number Diff line change 1
- #if ! NET452
1
+ #if NET471 || NETCOREAPP3_1_OR_GREATER
2
2
namespace JavaScriptEngineSwitcher . Tests . NiL
3
3
{
4
4
public class Es5Tests : Es5TestsBase
Original file line number Diff line number Diff line change 1
- #if ! NET452
1
+ #if NET471 || NETCOREAPP3_1_OR_GREATER
2
2
using System ;
3
3
4
4
using Xunit ;
@@ -13,6 +13,19 @@ protected override string EngineName
13
13
}
14
14
15
15
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
+
16
29
#region Embedding of types
17
30
18
31
#region Types with methods
Original file line number Diff line number Diff line change 1
- #if ! NET452
1
+ #if NET471 || NETCOREAPP3_1_OR_GREATER
2
2
namespace JavaScriptEngineSwitcher . Tests . NiL
3
3
{
4
4
public class MultithreadingTests : MultithreadingTestsBase
Original file line number Diff line number Diff line change 1
- #if ! NET452
1
+ #if NET471 || NETCOREAPP3_1_OR_GREATER
2
2
namespace JavaScriptEngineSwitcher . Tests . NiL
3
3
{
4
4
public class PrecompilationTests : PrecompilationTestsBase
You can’t perform that action at this time.
0 commit comments