Skip to content

Commit 9fe8da8

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.NiL:
 1. NiL.JS was updated to version 2.5.1673; 2. Restored support for .NET Framework 4.6.1.
1 parent 2e5b12b commit 9fe8da8

33 files changed

+65
-65
lines changed

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

Lines changed: 5 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.22.0</VersionPrefix>
6-
<TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
6+
<TargetFrameworks>net461;net48;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -17,16 +17,16 @@
1717
<Import Project="../../build/nuget-for-dotnet-lib.props" />
1818

1919
<PropertyGroup>
20-
<Description>JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1672).</Description>
20+
<Description>JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1673).</Description>
2121
<PackageTags>$(PackageCommonTags);NiL</PackageTags>
2222
<PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_NiL_Logo128x128.png</PackageIconFullPath>
23-
<PackageReleaseNotes>1. NiL.JS was updated to version 2.5.1672;
24-
2. No longer supports a .NET Framework 4.6.1.</PackageReleaseNotes>
23+
<PackageReleaseNotes>1. NiL.JS was updated to version 2.5.1673;
24+
2. Restored support for .NET Framework 4.6.1.</PackageReleaseNotes>
2525
</PropertyGroup>
2626

2727
<ItemGroup>
2828
<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
29-
<PackageReference Include="NiL.JS" Version="2.5.1672" />
29+
<PackageReference Include="NiL.JS" Version="2.5.1673" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/JavaScriptEngineSwitcher.NiL/NiLJsEngine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public sealed class NiLJsEngine : JsEngineBase
4141
/// <summary>
4242
/// Version of original JS engine
4343
/// </summary>
44-
private const string EngineVersion = "2.5.1672";
44+
private const string EngineVersion = "2.5.1673";
4545

4646
/// <summary>
4747
/// Regular expression for working with the syntax error message

‎src/JavaScriptEngineSwitcher.NiL/readme.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +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.1672).
15+
NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1673).
1616

1717
=============
1818
RELEASE NOTES
1919
=============
20-
1. NiL.JS was updated to version 2.5.1672;
21-
2. No longer supports a .NET Framework 4.6.1.
20+
1. NiL.JS was updated to version 2.5.1673;
21+
2. Restored support for .NET Framework 4.6.1.
2222

2323
=============
2424
DOCUMENTATION

‎test/JavaScriptEngineSwitcher.Benchmarks/HostObjectsEmbeddingBenchmark.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET48 || NETCOREAPP3_1_OR_GREATER
13+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1414
using JavaScriptEngineSwitcher.NiL;
1515
using JavaScriptEngineSwitcher.V8;
1616
#endif
@@ -120,7 +120,7 @@ public void Jurassic()
120120
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
121121
EmbedAndUseHostObjects(createJsEngine);
122122
}
123-
#if NET48
123+
#if NET461
124124

125125
[Benchmark]
126126
public void MsieClassic()
@@ -161,7 +161,7 @@ public void MsieChakraEdgeJsRt()
161161
});
162162
EmbedAndUseHostObjects(createJsEngine);
163163
}
164-
#if NET48 || NETCOREAPP3_1_OR_GREATER
164+
#if NET461 || NETCOREAPP3_1_OR_GREATER
165165

166166
[Benchmark]
167167
public void NiL()

‎test/JavaScriptEngineSwitcher.Benchmarks/HostTypesEmbeddingBenchmark.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET48 || NETCOREAPP3_1_OR_GREATER
13+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1414
using JavaScriptEngineSwitcher.NiL;
1515
using JavaScriptEngineSwitcher.V8;
1616
#endif
@@ -100,7 +100,7 @@ public void Jurassic()
100100
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
101101
EmbedAndUseHostTypes(createJsEngine);
102102
}
103-
#if NET48
103+
#if NET461
104104

105105
[Benchmark]
106106
public void MsieClassic()
@@ -141,7 +141,7 @@ public void MsieChakraEdgeJsRt()
141141
});
142142
EmbedAndUseHostTypes(createJsEngine);
143143
}
144-
#if NET48 || NETCOREAPP3_1_OR_GREATER
144+
#if NET461 || NETCOREAPP3_1_OR_GREATER
145145

146146
[Benchmark]
147147
public void NiL()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: Benchmarks</Product>
55
<VersionPrefix>3.22.0</VersionPrefix>
6-
<TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
6+
<TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
@@ -35,15 +35,15 @@
3535
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
3636
</ItemGroup>
3737

38-
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
38+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
3939
<PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.3" />
4040
</ItemGroup>
4141

42-
<ItemGroup Condition=" '$(TargetFramework)' != 'net48' ">
42+
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
4343
<PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.7" />
4444
</ItemGroup>
4545

46-
<ItemGroup Condition=" '$(TargetFramework)' != 'net48' ">
46+
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
4747
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
4848
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />
4949
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm" />

‎test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionHeavyBenchmark.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET48 || NETCOREAPP3_1_OR_GREATER
13+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1414
using JavaScriptEngineSwitcher.NiL;
1515
#endif
1616
using JavaScriptEngineSwitcher.Node;
17-
#if NET48 || NETCOREAPP3_1_OR_GREATER
17+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1818
using JavaScriptEngineSwitcher.V8;
1919
#endif
2020
using JavaScriptEngineSwitcher.Vroom;
21-
#if NET48 || NETCOREAPP3_1_OR_GREATER
21+
#if NET461 || NETCOREAPP3_1_OR_GREATER
2222
using JavaScriptEngineSwitcher.Yantra;
2323
#endif
2424

@@ -182,7 +182,7 @@ public void Jurassic(bool withPrecompilation)
182182
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
183183
RenderTemplates(createJsEngine, withPrecompilation);
184184
}
185-
#if NET48
185+
#if NET461
186186

187187
[Benchmark]
188188
public void MsieClassic()
@@ -228,7 +228,7 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
228228
});
229229
RenderTemplates(createJsEngine, withPrecompilation);
230230
}
231-
#if NET48 || NETCOREAPP3_1_OR_GREATER
231+
#if NET461 || NETCOREAPP3_1_OR_GREATER
232232

233233
[Benchmark]
234234
public void NiL()
@@ -244,7 +244,7 @@ public void Node()
244244
Func<IJsEngine> createJsEngine = () => new NodeJsEngine();
245245
RenderTemplates(createJsEngine, false);
246246
}
247-
#if NET48 || NETCOREAPP3_1_OR_GREATER
247+
#if NET461 || NETCOREAPP3_1_OR_GREATER
248248

249249
[Benchmark]
250250
[Arguments(false)]
@@ -262,7 +262,7 @@ public void Vroom()
262262
Func<IJsEngine> createJsEngine = () => new VroomJsEngine();
263263
RenderTemplates(createJsEngine, false);
264264
}
265-
#if NET48 || NETCOREAPP3_1_OR_GREATER
265+
#if NET461 || NETCOREAPP3_1_OR_GREATER
266266

267267
[Benchmark]
268268
public void Yantra()

‎test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionLightBenchmark.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET48 || NETCOREAPP3_1_OR_GREATER
13+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1414
using JavaScriptEngineSwitcher.NiL;
1515
#endif
1616
using JavaScriptEngineSwitcher.Node;
17-
#if NET48 || NETCOREAPP3_1_OR_GREATER
17+
#if NET461 || NETCOREAPP3_1_OR_GREATER
1818
using JavaScriptEngineSwitcher.V8;
1919
#endif
2020
using JavaScriptEngineSwitcher.Vroom;
21-
#if NET48 || NETCOREAPP3_1_OR_GREATER
21+
#if NET461 || NETCOREAPP3_1_OR_GREATER
2222
using JavaScriptEngineSwitcher.Yantra;
2323
#endif
2424

@@ -217,7 +217,7 @@ public void Jurassic(bool withPrecompilation)
217217
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
218218
TransliterateStrings(createJsEngine, withPrecompilation);
219219
}
220-
#if NET48
220+
#if NET461
221221

222222
[Benchmark]
223223
public void MsieClassic()
@@ -262,7 +262,7 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
262262
});
263263
TransliterateStrings(createJsEngine, withPrecompilation);
264264
}
265-
#if NET48 || NETCOREAPP3_1_OR_GREATER
265+
#if NET461 || NETCOREAPP3_1_OR_GREATER
266266

267267
[Benchmark]
268268
public void NiL()
@@ -278,7 +278,7 @@ public void Node()
278278
Func<IJsEngine> createJsEngine = () => new NodeJsEngine();
279279
TransliterateStrings(createJsEngine, false);
280280
}
281-
#if NET48 || NETCOREAPP3_1_OR_GREATER
281+
#if NET461 || NETCOREAPP3_1_OR_GREATER
282282

283283
[Benchmark]
284284
[Arguments(false)]
@@ -296,7 +296,7 @@ public void Vroom()
296296
Func<IJsEngine> createJsEngine = () => new VroomJsEngine();
297297
TransliterateStrings(createJsEngine, false);
298298
}
299-
#if NET48 || NETCOREAPP3_1_OR_GREATER
299+
#if NET461 || NETCOREAPP3_1_OR_GREATER
300300

301301
[Benchmark]
302302
public void Yantra()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: Tests</Product>
55
<VersionPrefix>3.22.0</VersionPrefix>
6-
<TargetFrameworks>net452;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
6+
<TargetFrameworks>net452;net471;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<LangVersion>latest</LangVersion>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -28,7 +28,7 @@
2828
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
2929
</ItemGroup>
3030

31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net48' ">
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net471' ">
3232
<Reference Include="System.Drawing" />
3333
</ItemGroup>
3434

@@ -62,7 +62,7 @@
6262
<PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.4.5" />
6363
</ItemGroup>
6464

65-
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'net48' ">
65+
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'net471' ">
6666
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
6767
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />
6868
</ItemGroup>
@@ -75,7 +75,7 @@
7575
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
7676
</ItemGroup>
7777

78-
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'net48' And '$(TargetFramework)' != 'netcoreapp2.1' ">
78+
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'net471' And '$(TargetFramework)' != 'netcoreapp2.1' ">
7979
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm" />
8080
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm64" />
8181
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-x64" />

‎test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ string TestAllowReflectionSetting(bool allowReflection)
427427

428428
// Act and Assert
429429
Assert.Null(TestAllowReflectionSetting(true));
430-
#if NET48
430+
#if NET471
431431
Assert.Null(TestAllowReflectionSetting(false));
432432
#else
433433
Assert.Equal("undefined", TestAllowReflectionSetting(false));
@@ -451,7 +451,7 @@ string TestAllowReflectionSetting(bool allowReflection)
451451

452452
// Act and Assert
453453
Assert.Equal(typeof(LoginFailedException).FullName, TestAllowReflectionSetting(true));
454-
#if NET48
454+
#if NET471
455455
Assert.Equal(typeof(LoginFailedException).FullName, TestAllowReflectionSetting(false));
456456
#else
457457

0 commit comments

Comments
 (0)