In JavaScriptEngineSwitcher.Jint added support for the Jint version 3.0.0 Beta 2059

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/CustomTypeResolvers.cs

@@ -89,6 +89,15 @@ private MemberComparer()
 
 			public override bool Equals(T x, T y)
 			{
+				if (x == null && y == null)
+				{
+					return true;
+				}
+				else if (x == null || y == null)
+				{
+					return false;
+				}
+
 				return x.Module == y.Module && x.MetadataToken == y.MetadataToken;
 			}
 

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -17,15 +17,15 @@
   <Import Project="../../build/nuget-for-dotnet-lib.props" />
 
   <PropertyGroup>
-    <Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2058).</Description>
+    <Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2059).</Description>
     <PackageTags>$(PackageCommonTags);Jint</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconFullPath>
-    <PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 2058.</PackageReleaseNotes>
+    <PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 2059.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
-    <PackageReference Include="Jint" Version="3.0.0-beta-2058" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-2059" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 
 using Jint;
-using IOriginalPrimitiveInstance = Jint.Native.IPrimitiveInstance;
+using IOriginalPrimitive = Jint.Native.IJsPrimitive;
 using OriginalCancellationConstraint = Jint.Constraints.CancellationConstraint;
 using OriginalDebuggerEventHandler = Jint.Runtime.Debugger.DebugHandler.DebugEventHandler;
 using OriginalDebuggerStatementHandlingMode = Jint.Runtime.Debugger.DebuggerStatementHandling;
@@ -18,7 +18,6 @@
 using OriginalRuntimeException = Jint.Runtime.JintException;
 using OriginalStatementsCountOverflowException = Jint.Runtime.StatementsCountOverflowException;
 using OriginalTypeReference = Jint.Runtime.Interop.TypeReference;
-using OriginalTypeResolver = Jint.Runtime.Interop.TypeResolver;
 using OriginalTypes = Jint.Runtime.Types;
 using OriginalValue = Jint.Native.JsValue;
 
@@ -51,7 +50,7 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "3.0.0 Beta 2058";
+		private const string EngineVersion = "3.0.0 Beta 2059";
 
 		/// <summary>
 		/// Jint JS engine
@@ -146,14 +145,14 @@ public JintJsEngine(JintSettings settings)
 					options.SetTypeResolver(jintSettings.AllowReflection ?
 						CustomTypeResolvers.AllowingReflection : CustomTypeResolvers.DisallowingReflection);
 				});
-				_cancellationConstraint = _jsEngine.FindConstraint<OriginalCancellationConstraint>();
+				_cancellationConstraint = _jsEngine.Constraints.Find<OriginalCancellationConstraint>();
 				if (_debuggerBreakCallback != null)
 				{
-					_jsEngine.DebugHandler.Break += _debuggerBreakCallback;
+					_jsEngine.Debugger.Break += _debuggerBreakCallback;
 				}
 				if (_debuggerStepCallback != null)
 				{
-					_jsEngine.DebugHandler.Step += _debuggerStepCallback;
+					_jsEngine.Debugger.Step += _debuggerStepCallback;
 				}
 				_strictMode = settings.StrictMode;
 			}
@@ -189,7 +188,7 @@ private object MapToHostType(OriginalValue value)
 					return Undefined.Value;
 
 				case OriginalTypes.Object:
-					if (!(value is IOriginalPrimitiveInstance))
+					if (!(value is IOriginalPrimitive))
 					{
 						return value;
 					}
@@ -692,12 +691,12 @@ public override void Dispose()
 					{
 						if (_debuggerStepCallback != null)
 						{
-							_jsEngine.DebugHandler.Step -= _debuggerStepCallback;
+							_jsEngine.Debugger.Step -= _debuggerStepCallback;
 						}
 
 						if (_debuggerBreakCallback != null)
 						{
-							_jsEngine.DebugHandler.Break -= _debuggerBreakCallback;
+							_jsEngine.Debugger.Break -= _debuggerBreakCallback;
 						}
 
 						_jsEngine.Dispose();

src/JavaScriptEngineSwitcher.Jint/readme.txt

@@ -13,12 +13,12 @@
    ===========
    JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
    Jint JavaScript Engine (http://github.com/sebastienros/jint) version
-   3.0.0 Beta 2058).
+   3.0.0 Beta 2059).
 
    =============
    RELEASE NOTES
    =============
-   Jint was updated to version 3.0.0 Beta 2058.
+   Jint was updated to version 3.0.0 Beta 2059.
 
    =============
    DOCUMENTATION