Skip to content

Commit 84ade62

Browse files
committed
In JavaScriptEngineSwitcher.Jint added support of Jint version 3.0.0 Beta 2032
1 parent 65a2457 commit 84ade62

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "5.0.202"
3+
"version": "5.0.203"
44
}
55
}

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
<Import Project="../../build/nuget-for-dotnet-lib.props" />
1919

2020
<PropertyGroup>
21-
<Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2031).</Description>
21+
<Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2032).</Description>
2222
<PackageTags>$(PackageCommonTags);Jint</PackageTags>
2323
<PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconFullPath>
24-
<PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 2031.</PackageReleaseNotes>
24+
<PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 2032.</PackageReleaseNotes>
2525
</PropertyGroup>
2626

2727
<ItemGroup>
2828
<PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
29-
<PackageReference Include="Jint" Version="3.0.0-beta-2031" />
29+
<PackageReference Include="Jint" Version="3.0.0-beta-2032" />
3030

3131
<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
3232
</ItemGroup>

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
using Jint;
55
using IOriginalPrimitiveInstance = Jint.Native.IPrimitiveInstance;
66
using OriginalCancellationConstraint = Jint.Constraints.CancellationConstraint;
7-
using OriginalDebuggerBreakDelegate = Jint.Engine.BreakDelegate;
7+
using OriginalDebuggerBreakDelegate = Jint.Runtime.Debugger.DebugHandler.BreakDelegate;
88
using OriginalDebuggerStatementHandlingMode = Jint.Runtime.Debugger.DebuggerStatementHandling;
9-
using OriginalDebuggerStepDelegate = Jint.Engine.DebugStepDelegate;
9+
using OriginalDebuggerStepDelegate = Jint.Runtime.Debugger.DebugHandler.DebugStepDelegate;
1010
using OriginalEngine = Jint.Engine;
1111
using OriginalExecutionCanceledException = Jint.Runtime.ExecutionCanceledException;
1212
using OriginalJavaScriptException = Jint.Runtime.JavaScriptException;
@@ -52,7 +52,7 @@ public sealed class JintJsEngine : JsEngineBase
5252
/// <summary>
5353
/// Version of original JS engine
5454
/// </summary>
55-
private const string EngineVersion = "3.0.0 Beta 2031";
55+
private const string EngineVersion = "3.0.0 Beta 2032";
5656

5757
/// <summary>
5858
/// Jint JS engine
@@ -138,11 +138,11 @@ public JintJsEngine(JintSettings settings)
138138
});
139139
if (_debuggerBreakCallback != null)
140140
{
141-
_jsEngine.Break += _debuggerBreakCallback;
141+
_jsEngine.DebugHandler.Break += _debuggerBreakCallback;
142142
}
143143
if (_debuggerStepCallback != null)
144144
{
145-
_jsEngine.Step += _debuggerStepCallback;
145+
_jsEngine.DebugHandler.Step += _debuggerStepCallback;
146146
}
147147
}
148148
catch (Exception e)
@@ -397,7 +397,7 @@ protected override object InnerEvaluate(string expression, string documentName)
397397

398398
try
399399
{
400-
resultValue = _jsEngine.Execute(expression, parserOptions).GetCompletionValue();
400+
resultValue = _jsEngine.Evaluate(expression, parserOptions);
401401
}
402402
catch (OriginalParserException e)
403403
{
@@ -710,13 +710,13 @@ public override void Dispose()
710710
{
711711
if (_debuggerStepCallback != null)
712712
{
713-
_jsEngine.Step -= _debuggerStepCallback;
713+
_jsEngine.DebugHandler.Step -= _debuggerStepCallback;
714714
_debuggerStepCallback = null;
715715
}
716716

717717
if (_debuggerBreakCallback != null)
718718
{
719-
_jsEngine.Break -= _debuggerBreakCallback;
719+
_jsEngine.DebugHandler.Break -= _debuggerBreakCallback;
720720
_debuggerBreakCallback = null;
721721
}
722722

src/JavaScriptEngineSwitcher.Jint/JintSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22

3-
using OriginalDebuggerBreakDelegate = Jint.Engine.BreakDelegate;
4-
using OriginalDebuggerStepDelegate = Jint.Engine.DebugStepDelegate;
3+
using OriginalDebuggerBreakDelegate = Jint.Runtime.Debugger.DebugHandler.BreakDelegate;
4+
using OriginalDebuggerStepDelegate = Jint.Runtime.Debugger.DebugHandler.DebugStepDelegate;
55

66
namespace JavaScriptEngineSwitcher.Jint
77
{

src/JavaScriptEngineSwitcher.Jint/readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
===========
1414
JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
1515
Jint JavaScript Engine (http://github.com/sebastienros/jint) version
16-
3.0.0 Beta 2031).
16+
3.0.0 Beta 2032).
1717

1818
=============
1919
RELEASE NOTES
2020
=============
21-
Jint was updated to version 3.0.0 Beta 2031.
21+
Jint was updated to version 3.0.0 Beta 2032.
2222

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

0 commit comments

Comments
 (0)