In JavaScriptEngineSwitcher.NiL:

Taritsyn · Taritsyn · commit 27ff7de5ad0d · 2021-11-23T14:13:12.000+03:00
1. NiL.JS was updated to version 2.5.1541;
	2. No longer supports a .NET Framework 4.0 Client and .NET Framework 4.5;
	3. Added support of .NET Framework 4.8 and .NET 6.0.
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/App_Start/JsEngineSwitcherConfig.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/App_Start/JsEngineSwitcherConfig.cs
@@ -2,7 +2,6 @@
 using JavaScriptEngineSwitcher.Core;
 using JavaScriptEngineSwitcher.Jurassic;
 using JavaScriptEngineSwitcher.Msie;
-using JavaScriptEngineSwitcher.NiL;
 using JavaScriptEngineSwitcher.Vroom;
 
 namespace JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4
@@ -18,7 +17,6 @@ public static void Configure(IJsEngineSwitcher engineSwitcher)
 				{
 					EngineMode = JsEngineMode.ChakraIeJsRt
 				})
-				.AddNiL()
 				.AddVroom()
 				;
 			engineSwitcher.DefaultEngineName = ChakraCoreJsEngine.EngineName;
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj
@@ -129,10 +129,6 @@
       <Project>{b3c4aa95-2227-47dd-b58c-22fa589cb28d}</Project>
       <Name>JavaScriptEngineSwitcher.Msie</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.NiL\JavaScriptEngineSwitcher.NiL.csproj">
-      <Project>{f0bf7975-2e8a-4ec8-8daa-760a4302f419}</Project>
-      <Name>JavaScriptEngineSwitcher.NiL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Vroom\JavaScriptEngineSwitcher.Vroom.csproj">
       <Project>{238d7e69-7052-4dfc-83ef-79d3d124c12b}</Project>
       <Name>JavaScriptEngineSwitcher.Vroom</Name>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj
@@ -37,7 +37,6 @@
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
-    <ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
     <ProjectReference Include="../JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj" />
     <ProjectReference Include="../JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/Startup.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/Startup.cs
@@ -10,7 +10,6 @@
 using JavaScriptEngineSwitcher.Extensions.MsDependencyInjection;
 using JavaScriptEngineSwitcher.Jurassic;
 using JavaScriptEngineSwitcher.Msie;
-using JavaScriptEngineSwitcher.NiL;
 using JavaScriptEngineSwitcher.Sample.Logic.Services;
 using JavaScriptEngineSwitcher.V8;
 using JavaScriptEngineSwitcher.Vroom;
@@ -62,7 +61,6 @@ public void ConfigureServices(IServiceCollection services)
 				{
 					options.EngineMode = JsEngineMode.ChakraIeJsRt;
 				})
-				.AddNiL()
 				.AddV8()
 				.AddVroom()
 				;
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Logic/Services/JsEvaluationService.cs b/samples/JavaScriptEngineSwitcher.Sample.Logic/Services/JsEvaluationService.cs
@@ -25,11 +25,7 @@ static JsEvaluationService()
 		{
 			_engineDisplayNameMappings = new Dictionary<string, string>
 			{
-				{ "ChakraCoreJsEngine", "ChakraCore" },
-				{ "JintJsEngine", "Jint" },
-				{ "JurassicJsEngine", "Jurassic" },
-				{ "MsieJsEngine", "MSIE" },
-				{ "V8JsEngine", "V8" }
+				{ "MsieJsEngine", "MSIE" }
 			};
 		}
 
diff --git a/src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj b/src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>JS Engine Switcher: NiL</Product>
     <VersionPrefix>3.12.4</VersionPrefix>
-    <TargetFrameworks>net40-client;net45;net461;netstandard1.3;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netstandard1.3;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -16,15 +16,17 @@
   <Import Project="../../build/nuget-for-dotnet-lib.props" />
 
   <PropertyGroup>
-    <Description>JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1532).</Description>
+    <Description>JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1541).</Description>
     <PackageTags>$(PackageCommonTags);NiL</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_NiL_Logo128x128.png</PackageIconFullPath>
-    <PackageReleaseNotes>NiL.JS was updated to version 2.5.1532.</PackageReleaseNotes>
+    <PackageReleaseNotes>1. NiL.JS was updated to version 2.5.1541;
+2. No longer supports a .NET Framework 4.0 Client and .NET Framework 4.5;
+3. Added support of .NET Framework 4.8 and .NET 6.0.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
-    <PackageReference Include="NiL.JS" Version="2.5.1532" />
+    <PackageReference Include="NiL.JS" Version="2.5.1541" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/JavaScriptEngineSwitcher.NiL/NiLJsEngine.cs b/src/JavaScriptEngineSwitcher.NiL/NiLJsEngine.cs
@@ -39,7 +39,7 @@ public sealed class NiLJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "2.5.1532";
+		private const string EngineVersion = "2.5.1541";
 
 		/// <summary>
 		/// Regular expression for working with the syntax error message
diff --git a/src/JavaScriptEngineSwitcher.NiL/readme.txt b/src/JavaScriptEngineSwitcher.NiL/readme.txt
@@ -12,12 +12,14 @@
    DESCRIPTION
    ===========
    JavaScriptEngineSwitcher.NiL contains adapter `NiLJsEngine` (wrapper for the
-   NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1532).
+   NiL JavaScript Engine (https://github.com/nilproject/NiL.JS) version 2.5.1541).
 
    =============
    RELEASE NOTES
    =============
-   NiL.JS was updated to version 2.5.1532.
+   1. NiL.JS was updated to version 2.5.1541;
+   2. No longer supports a .NET Framework 4.0 Client and .NET Framework 4.5;
+   3. Added support of .NET Framework 4.8 and .NET 6.0.
 
    =============
    DOCUMENTATION
diff --git a/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj b/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj
@@ -24,7 +24,6 @@
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
-    <ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
   </ItemGroup>
 
@@ -69,6 +68,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
+    <ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
     <ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
   </ItemGroup>
 
diff --git a/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs b/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs
@@ -10,8 +10,8 @@
 #endif
 using JavaScriptEngineSwitcher.Jurassic;
 using JavaScriptEngineSwitcher.Msie;
-using JavaScriptEngineSwitcher.NiL;
 #if !NET452
+using JavaScriptEngineSwitcher.NiL;
 using JavaScriptEngineSwitcher.Node;
 #endif
 #if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
@@ -44,8 +44,8 @@ public static void Initialize()
 					{
 						EngineMode = JsEngineMode.ChakraIeJsRt
 					})
-					.AddNiL()
 #if !NET452
+					.AddNiL()
 					.AddNode()
 #endif
 #if NETFRAMEWORK || NETCOREAPP3_1_OR_GREATER
diff --git a/test/JavaScriptEngineSwitcher.Tests/NiL/CommonTests.cs b/test/JavaScriptEngineSwitcher.Tests/NiL/CommonTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if !NET452
+using System;
 
 using Xunit;
 
@@ -253,4 +254,5 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
 
 		#endregion
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/NiL/Es5Tests.cs b/test/JavaScriptEngineSwitcher.Tests/NiL/Es5Tests.cs
@@ -1,4 +1,5 @@
-﻿namespace JavaScriptEngineSwitcher.Tests.NiL
+﻿#if !NET452
+namespace JavaScriptEngineSwitcher.Tests.NiL
 {
 	public class Es5Tests : Es5TestsBase
 	{
@@ -7,4 +8,5 @@ protected override string EngineName
 			get { return "NiLJsEngine"; }
 		}
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/NiL/InteropTests.cs b/test/JavaScriptEngineSwitcher.Tests/NiL/InteropTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if !NET452
+using System;
 
 using Xunit;
 
@@ -48,4 +49,5 @@ public override void EmbeddingOfBuiltinReferenceTypeWithMethodsIsCorrect()
 
 		#endregion
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/NiL/MultithreadingTests.cs b/test/JavaScriptEngineSwitcher.Tests/NiL/MultithreadingTests.cs
@@ -1,4 +1,5 @@
-﻿namespace JavaScriptEngineSwitcher.Tests.NiL
+﻿#if !NET452
+namespace JavaScriptEngineSwitcher.Tests.NiL
 {
 	public class MultithreadingTests : MultithreadingTestsBase
 	{
@@ -7,4 +8,5 @@ protected override string EngineName
 			get { return "NiLJsEngine"; }
 		}
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/NiL/PrecompilationTests.cs b/test/JavaScriptEngineSwitcher.Tests/NiL/PrecompilationTests.cs
@@ -1,4 +1,5 @@
-﻿namespace JavaScriptEngineSwitcher.Tests.NiL
+﻿#if !NET452
+namespace JavaScriptEngineSwitcher.Tests.NiL
 {
 	public class PrecompilationTests : PrecompilationTestsBase
 	{
@@ -7,4 +8,5 @@ protected override string EngineName
 			get { return "NiLJsEngine"; }
 		}
 	}
-}
+}
+#endif

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using JavaScriptEngineSwitcher.Core;`
`3`	`3`	`using JavaScriptEngineSwitcher.Jurassic;`
`4`	`4`	`using JavaScriptEngineSwitcher.Msie;`
`5`		`-using JavaScriptEngineSwitcher.NiL;`
`6`	`5`	`using JavaScriptEngineSwitcher.Vroom;`
`7`	`6`
`8`	`7`	`namespace JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4`
`@@ -18,7 +17,6 @@ public static void Configure(IJsEngineSwitcher engineSwitcher)`
`18`	`17`	`{`
`19`	`18`	`EngineMode = JsEngineMode.ChakraIeJsRt`
`20`	`19`	`})`
`21`		`- .AddNiL()`
`22`	`20`	`.AddVroom()`
`23`	`21`	`;`
`24`	`22`	`engineSwitcher.DefaultEngineName = ChakraCoreJsEngine.EngineName;`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,7 @@ static JsEvaluationService()`
`25`	`25`	`{`
`26`	`26`	`_engineDisplayNameMappings = new Dictionary<string, string>`
`27`	`27`	`{`
`28`		`- { "ChakraCoreJsEngine", "ChakraCore" },`
`29`		`- { "JintJsEngine", "Jint" },`
`30`		`- { "JurassicJsEngine", "Jurassic" },`
`31`		`- { "MsieJsEngine", "MSIE" },`
`32`		`- { "V8JsEngine", "V8" }`
	`28`	`+ { "MsieJsEngine", "MSIE" }`
`33`	`29`	`};`
`34`	`30`	`}`
`35`	`31`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-namespace JavaScriptEngineSwitcher.Tests.NiL`
	`1`	`+#if !NET452`
	`2`	`+namespace JavaScriptEngineSwitcher.Tests.NiL`
`2`	`3`	`{`
`3`	`4`	`public class Es5Tests : Es5TestsBase`
`4`	`5`	`{`
`@@ -7,4 +8,5 @@ protected override string EngineName`
`7`	`8`	`get { return "NiLJsEngine"; }`
`8`	`9`	`}`
`9`	`10`	`}`
`10`		`-}`
	`11`	`+}`
	`12`	`+#endif`