Skip to content

Commit dbd37b0

Browse files
committed
1. In JavaScriptEngineSwitcher.Jurassic added support of Jurassic version of March 5, 2016;
2. In JavaScriptEngineSwitcher.Jint added support of Jint version of March 6, 2016; 3. In JavaScriptEngineSwitcher.ChakraCore added support of ChakraCore version of March 6, 2016.
1 parent a9e2267 commit dbd37b0

File tree

11 files changed

+292
-205
lines changed

11 files changed

+292
-205
lines changed
258 KB
Binary file not shown.
188 KB
Binary file not shown.

Binaries/Jint/Jint.dll

0 Bytes
Binary file not shown.

Binaries/Jurassic/Jurassic.dll

512 Bytes
Binary file not shown.

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
3030
/// <summary>
3131
/// Version of original JavaScript engine
3232
/// </summary>
33-
private const string ENGINE_VERSION = "1.1";
33+
private const string ENGINE_VERSION = "Mar 6, 2016";
3434

3535
/// <summary>
3636
/// Instance of JavaScript runtime
@@ -43,9 +43,9 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
4343
private readonly JsContext _jsContext;
4444

4545
/// <summary>
46-
/// Run synchronizer
46+
/// Synchronizer of code execution
4747
/// </summary>
48-
private readonly object _runSynchronizer = new object();
48+
private readonly object _executionSynchronizer = new object();
4949

5050
/// <summary>
5151
/// List of external objects
@@ -120,7 +120,7 @@ public ChakraCoreJsEngine()
120120

121121
private void InvokeScript(Action action)
122122
{
123-
lock (_runSynchronizer)
123+
lock (_executionSynchronizer)
124124
using (new JsScope(_jsContext))
125125
{
126126
try
@@ -136,7 +136,7 @@ private void InvokeScript(Action action)
136136

137137
private T InvokeScript<T>(Func<T> func)
138138
{
139-
lock (_runSynchronizer)
139+
lock (_executionSynchronizer)
140140
using (new JsScope(_jsContext))
141141
{
142142
try
@@ -157,9 +157,9 @@ private T InvokeScript<T>(Func<T> func)
157157
/// managed objects contained in fields of class</param>
158158
private void Dispose(bool disposing)
159159
{
160-
lock (_runSynchronizer)
160+
if (_disposedFlag.Set())
161161
{
162-
if (_disposedFlag.Set())
162+
lock (_executionSynchronizer)
163163
{
164164
_jsRuntime.Dispose();
165165

@@ -336,7 +336,7 @@ private void ExternalObjectFinalizeCallback(IntPtr data)
336336
return;
337337
}
338338

339-
lock (_runSynchronizer)
339+
lock (_executionSynchronizer)
340340
{
341341
_externalObjects.Remove(obj);
342342
}

src/JavaScriptEngineSwitcher.ChakraCore/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("07d1fd39-469c-44ae-bf0f-4116f8887669")]
1515

16-
[assembly: AssemblyVersion("1.5.0.0")]
17-
[assembly: AssemblyFileVersion("1.5.0.0")]
16+
[assembly: AssemblyVersion("1.5.1.0")]
17+
[assembly: AssemblyFileVersion("1.5.1.0")]

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</ProjectReference>
4545
</ItemGroup>
4646
<ItemGroup>
47-
<Reference Include="Jint, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
47+
<Reference Include="Jint, Version=2.8.0.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
4949
<HintPath>..\..\Binaries\Jint\Jint.dll</HintPath>
5050
</Reference>

0 commit comments

Comments
 (0)