Skip to content

Commit bab39ec

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.ChakraCore:
 1. ChakraCore was updated to version 1.7.5 2. In configuration settings of the ChakraCore JS engine was added one new property - `DisableFatalOnOOM` (default `false`)
1 parent 1ce54b2 commit bab39ec

28 files changed

Lines changed: 102 additions & 71 deletions

File tree

‎lib/ChakraCore/runtimes/linux-x64/native/libChakraCore.so‎

123 KB
Binary file not shown.

‎lib/ChakraCore/runtimes/osx-x64/native/libChakraCore.dylib‎

31.7 KB
Binary file not shown.

‎lib/ChakraCore/runtimes/win-x64/native/ChakraCore.dll‎

22.5 KB
Binary file not shown.

‎lib/ChakraCore/runtimes/win-x86/native/ChakraCore.dll‎

15.5 KB
Binary file not shown.

‎lib/ChakraCore/runtimes/win8-arm/native/ChakraCore.dll‎

16.5 KB
Binary file not shown.

‎samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props')" />
4-
<Import Project="..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props')" />
5-
<Import Project="..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props')" />
3+
<Import Project="..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props')" />
4+
<Import Project="..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props')" />
5+
<Import Project="..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props')" />
66
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
77
<PropertyGroup>
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -203,8 +203,8 @@
203203
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
204204
</PropertyGroup>
205205
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
206-
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props'))" />
207-
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props'))" />
208-
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props'))" />
206+
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x64.props'))" />
207+
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props'))" />
208+
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha9\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props'))" />
209209
</Target>
210210
</Project>

‎samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" version="3.0.0-alpha7" targetFramework="net40" />
4-
<package id="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" version="3.0.0-alpha7" targetFramework="net40" />
5-
<package id="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" version="3.0.0-alpha7" targetFramework="net40" />
3+
<package id="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" version="3.0.0-alpha9" targetFramework="net40" />
4+
<package id="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" version="3.0.0-alpha9" targetFramework="net40" />
5+
<package id="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" version="3.0.0-alpha9" targetFramework="net40" />
66
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
77
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net40" />
88
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
2828
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
2929
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
30-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.0.0-alpha6" />
31-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.0.0-alpha6" />
32-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha7" />
33-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha7" />
34-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha7" />
30+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.0.0-alpha9" />
31+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.0.0-alpha9" />
32+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha9" />
33+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha9" />
34+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha9" />
3535

3636
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
3737
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
2828
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
29-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha7" />
30-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha7" />
31-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha7" />
29+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha9" />
30+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha9" />
31+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha9" />
3232
<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x64" Version="3.0.0-alpha7" />
3333
<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x86" Version="3.0.0-alpha7" />
3434

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
2222
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
23-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.0.0-alpha6" />
24-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.0.0-alpha6" />
25-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha7" />
26-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha7" />
27-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha7" />
23+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.0.0-alpha9" />
24+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.0.0-alpha9" />
25+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha9" />
26+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha9" />
27+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha9" />
2828

2929
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
3030
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />

0 commit comments

Comments
 (0)