Version 2.4.12

Taritsyn · Taritsyn · commit 99d570642f7d · 2018-02-20T22:17:23.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Change log
 ==========
 
+## v2.4.12 - February 20, 2018
+ * In JavaScriptEngineSwitcher.ChakraCore:
+   * ChakraCore was updated to version 1.8.1
+   * JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64 package has been replaced by the JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64 package
+   * ICU-57 library was embedded into the `libChakraCore.so` and `libChakraCore.dylib` assemblies
+   * Prevented an occurrence of the “Host may not have set any promise continuation callback. Promises may not be executed.” error
+   * In configuration settings of the ChakraCore JS engine was added two new properties - `MemoryLimit` and `DisableFatalOnOOM` (default `false`)
+   * Now during calling of the `CollectGarbage` method is no longer performed blocking
+
 ## v2.4.11 - December 24, 2017
  * In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 2.2.5
  * In JavaScriptEngineSwitcher.ChakraCore fixed a error, that occurred during finding the suitable method overload, that receives numeric values and interfaces as parameters, of the host object
diff --git a/NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec b/NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 	<metadata>
 		<id>JavaScriptEngineSwitcher.ChakraCore</id>
-		<version>2.4.11</version>
+		<version>2.4.12</version>
 		<title>JS Engine Switcher: ChakraCore</title>
 		<authors>Andrey Taritsyn</authors>
 		<owners>Andrey Taritsyn</owners>
diff --git a/NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt b/NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt
@@ -1,7 +1,7 @@
 ﻿
 
    --------------------------------------------------------------------------------
-                README file for JS Engine Switcher: ChakraCore v2.4.11
+                README file for JS Engine Switcher: ChakraCore v2.4.12
 
    --------------------------------------------------------------------------------
 
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ This library can be installed through NuGet:
    * [Windows (x86)](http://nuget.org/packages/JavaScriptEngineSwitcher.ChakraCore.Native.win-x86)
    * [Windows (x64)](http://nuget.org/packages/JavaScriptEngineSwitcher.ChakraCore.Native.win-x64)
    * [Windows (ARM)](http://nuget.org/packages/JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm)
-   * [Debian (x64)](http://nuget.org/packages/JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64)
+   * [Linux (x64)](http://nuget.org/packages/JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64)
    * [OS X (x64)](http://nuget.org/packages/JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64)
  * [JS Engine Switcher: Vroom](http://nuget.org/packages/JavaScriptEngineSwitcher.Vroom) (supports .NET Framework 4.0 Client, .NET Framework 4.5 and .NET Standard 1.6)
 
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/Properties/AssemblyInfo.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("39487053-b459-4433-ae93-e00affc653c6")]
 
-[assembly: AssemblyVersion("2.4.11.0")]
-[assembly: AssemblyFileVersion("2.4.11.0")]
+[assembly: AssemblyVersion("2.4.12.0")]
+[assembly: AssemblyFileVersion("2.4.12.0")]
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<VersionPrefix>2.4.10</VersionPrefix>
+		<VersionPrefix>2.4.12</VersionPrefix>
 		<TargetFramework>netcoreapp1.0</TargetFramework>
 		<RuntimeFrameworkVersion>1.0.9</RuntimeFrameworkVersion>
 		<OutputType>Exe</OutputType>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Properties/AssemblyInfo.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Properties/AssemblyInfo.cs
@@ -9,5 +9,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2.4.11.0")]
-[assembly: AssemblyFileVersion("2.4.11.0")]
+[assembly: AssemblyVersion("2.4.12.0")]
+[assembly: AssemblyFileVersion("2.4.12.0")]
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<VersionPrefix>2.4.10</VersionPrefix>
+		<VersionPrefix>2.4.12</VersionPrefix>
 		<TargetFramework>net451</TargetFramework>
 		<OutputType>Exe</OutputType>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/Properties/AssemblyInfo.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("6a7e3f16-3c75-425a-b15d-7b8db5b884c8")]
 
-[assembly: AssemblyVersion("2.4.11.0")]
-[assembly: AssemblyFileVersion("2.4.11.0")]
+[assembly: AssemblyVersion("2.4.12.0")]
+[assembly: AssemblyFileVersion("2.4.12.0")]
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj b/src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<VersionPrefix>2.4.10</VersionPrefix>
+		<VersionPrefix>2.4.12</VersionPrefix>
 		<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
 		<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
 		<OutputType>Library</OutputType>
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsContext.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsContext.cs
@@ -361,7 +361,7 @@ public static JsValue GetAndClearException()
 		/// </para>
 		/// </remarks>
 		/// <returns>The exception metadata for the runtime of the current context</returns>
-		public static JsValue JsGetAndClearExceptionWithMetadata()
+		public static JsValue GetAndClearExceptionWithMetadata()
 		{
 			JsValue metadata;
 			JsErrorHelpers.ThrowIfError(NativeMethods.JsGetAndClearExceptionWithMetadata(out metadata));
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsErrorHelpers.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsErrorHelpers.cs
@@ -116,18 +116,6 @@ public static void ThrowIfError(JsErrorCode error)
 					#region Script
 
 					case JsErrorCode.ScriptException:
-						{
-							JsValue errorMetadata;
-							JsErrorCode innerError = NativeMethods.JsGetAndClearExceptionWithMetadata(out errorMetadata);
-
-							if (innerError != JsErrorCode.NoError)
-							{
-								throw new JsFatalException(innerError);
-							}
-
-							throw new JsScriptException(error, errorMetadata, "Script threw an exception.");
-						}
-
 					case JsErrorCode.ScriptCompile:
 						{
 							JsValue errorMetadata;
@@ -138,7 +126,10 @@ public static void ThrowIfError(JsErrorCode error)
 								throw new JsFatalException(innerError);
 							}
 
-							throw new JsScriptException(error, errorMetadata, "Compile error.");
+							string message = error == JsErrorCode.ScriptCompile ?
+								"Compile error." : "Script threw an exception.";
+
+							throw new JsScriptException(error, errorMetadata, message);
 						}
 
 					case JsErrorCode.ScriptTerminated:
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/Properties/AssemblyInfo.cs b/src/JavaScriptEngineSwitcher.ChakraCore/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: Guid("07d1fd39-469c-44ae-bf0f-4116f8887669")]
 #endif
 
-[assembly: AssemblyVersion("2.4.11.0")]
-[assembly: AssemblyFileVersion("2.4.11.0")]
+[assembly: AssemblyVersion("2.4.12.0")]
+[assembly: AssemblyFileVersion("2.4.12.0")]
diff --git a/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj b/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<VersionPrefix>2.4.10</VersionPrefix>
+		<VersionPrefix>2.4.12</VersionPrefix>
 		<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
 		<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.9</RuntimeFrameworkVersion>
 		<OutputType>Library</OutputType>
diff --git a/test/JavaScriptEngineSwitcher.Tests/Properties/AssemblyInfo.cs b/test/JavaScriptEngineSwitcher.Tests/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: Guid("4cfa9f30-6718-4b7e-8329-7602278b8e31")]
 #endif
 
-[assembly: AssemblyVersion("2.4.11.0")]
-[assembly: AssemblyFileVersion("2.4.11.0")]
+[assembly: AssemblyVersion("2.4.12.0")]
+[assembly: AssemblyFileVersion("2.4.12.0")]

-Original file line number
+Diff line change
@@ @@ -1,7 +1,7 @@ @@
    --------------------------------------------------------------------------------
 -                README file for JS Engine Switcher: ChakraCore v2.4.11
 +                README file for JS Engine Switcher: ChakraCore v2.4.12
    --------------------------------------------------------------------------------