In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 2.2.0

Taritsyn · Taritsyn · commit edd084610c7e · 2017-04-22T13:01:26.000+03:00
diff --git a/NuGet/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.nuspec b/NuGet/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.nuspec
@@ -12,22 +12,23 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>JavaScriptEngineSwitcher.Msie contains adapter `MsieJsEngine` (wrapper for the MSIE JavaScript Engine for .Net (http://github.com/Taritsyn/MsieJavaScriptEngine)). For correct working of the MSIE JavaScript Engine it is recommended to install Internet Explorer 9 and above on a server.</description>
 		<summary>JavaScriptEngineSwitcher.Msie contains adapter `MsieJsEngine` (wrapper for the MSIE JavaScript Engine for .Net).</summary>
-		<releaseNotes>Added support of .NET Core 1.0.4.</releaseNotes>
+		<releaseNotes>1. Added support of .NET Core 1.0.4;
+2. Added support of MSIE JavaScript Engine version 2.2.0.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript MSIE IE Chakra</tags>
 		<dependencies>
 			<group targetFramework=".NETFramework4.0-Client">
-				<dependency id="MsieJavaScriptEngine" version="2.1.2" />
+				<dependency id="MsieJavaScriptEngine" version="2.2.0" />
 				<dependency id="JavaScriptEngineSwitcher.Core" version="2.2.0" />
 			</group>
 			<group targetFramework=".NETFramework4.5">
-				<dependency id="MsieJavaScriptEngine" version="2.1.2" />
+				<dependency id="MsieJavaScriptEngine" version="2.2.0" />
 				<dependency id="JavaScriptEngineSwitcher.Core" version="2.2.0" />
 			</group>
 			<group targetFramework=".NETStandard1.3">
 				<dependency id="NETStandard.Library" version="1.6.0" />
-				<dependency id="MsieJavaScriptEngine" version="2.1.2" />
+				<dependency id="MsieJavaScriptEngine" version="2.2.0" />
 				<dependency id="JavaScriptEngineSwitcher.Core" version="2.2.0" />
 			</group>
 		</dependencies>
diff --git a/NuGet/JavaScriptEngineSwitcher.Msie/readme.txt b/NuGet/JavaScriptEngineSwitcher.Msie/readme.txt
@@ -19,7 +19,8 @@
    =============
    RELEASE NOTES
    =============
-   Added support of .NET Core 1.0.4.
+   1. Added support of .NET Core 1.0.4;
+   2. Added support of MSIE JavaScript Engine version 2.2.0.
 
    =============
    DOCUMENTATION
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs b/src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs
@@ -45,7 +45,7 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// <summary>
 		/// JS source context
 		/// </summary>
-		JsSourceContext _jsSourceContext = JsSourceContext.FromIntPtr(IntPtr.Zero);
+		private JsSourceContext _jsSourceContext = JsSourceContext.FromIntPtr(IntPtr.Zero);
 
 		/// <summary>
 		/// Set of external objects
diff --git a/src/JavaScriptEngineSwitcher.Msie.Net4/JavaScriptEngineSwitcher.Msie.Net40.csproj b/src/JavaScriptEngineSwitcher.Msie.Net4/JavaScriptEngineSwitcher.Msie.Net40.csproj
@@ -45,8 +45,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="MsieJavaScriptEngine, Version=2.1.2.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MsieJavaScriptEngine.2.1.2\lib\net40-client\MsieJavaScriptEngine.dll</HintPath>
+    <Reference Include="MsieJavaScriptEngine, Version=2.2.0.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MsieJavaScriptEngine.2.2.0\lib\net40-client\MsieJavaScriptEngine.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/JavaScriptEngineSwitcher.Msie.Net4/packages.config b/src/JavaScriptEngineSwitcher.Msie.Net4/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MsieJavaScriptEngine" version="2.1.2" targetFramework="net40-Client" />
+  <package id="MsieJavaScriptEngine" version="2.2.0" targetFramework="net40-Client" />
 </packages>
diff --git a/src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj b/src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj
@@ -23,7 +23,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MsieJavaScriptEngine" Version="2.1.2" />
+		<PackageReference Include="MsieJavaScriptEngine" Version="2.2.0" />
 
 		<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
 	</ItemGroup>
diff --git a/src/JavaScriptEngineSwitcher.Msie/MsieJsEngine.cs b/src/JavaScriptEngineSwitcher.Msie/MsieJsEngine.cs
@@ -150,12 +150,17 @@ private JsRuntimeException ConvertMsieJsRuntimeExceptionToJsRuntimeException(
 		#region JsEngineBase implementation
 
 		protected override object InnerEvaluate(string expression)
+		{
+			return InnerEvaluate(expression, null);
+		}
+
+		protected override object InnerEvaluate(string expression, string documentName)
 		{
 			object result;
 
 			try
 			{
-				result = _jsEngine.Evaluate(expression);
+				result = _jsEngine.Evaluate(expression, documentName);
 			}
 			catch (OriginalJsRuntimeException e)
 			{
@@ -169,16 +174,26 @@ protected override object InnerEvaluate(string expression)
 
 		protected override T InnerEvaluate<T>(string expression)
 		{
-			object result = InnerEvaluate(expression);
+			return InnerEvaluate<T>(expression, null);
+		}
+
+		protected override T InnerEvaluate<T>(string expression, string documentName)
+		{
+			object result = InnerEvaluate(expression, documentName);
 
 			return OriginalTypeConverter.ConvertToType<T>(result);
 		}
 
 		protected override void InnerExecute(string code)
+		{
+			InnerExecute(code, null);
+		}
+
+		protected override void InnerExecute(string code, string documentName)
 		{
 			try
 			{
-				_jsEngine.Execute(code);
+				_jsEngine.Execute(code, documentName);
 			}
 			catch (OriginalJsRuntimeException e)
 			{

Original file line number	Diff line number	Diff line change
`@@ -150,12 +150,17 @@ private JsRuntimeException ConvertMsieJsRuntimeExceptionToJsRuntimeException(`
`150`	`150`	`#region JsEngineBase implementation`
`151`	`151`
`152`	`152`	`protected override object InnerEvaluate(string expression)`
	`153`	`+ {`
	`154`	`+ return InnerEvaluate(expression, null);`
	`155`	`+ }`
	`156`	`+`
	`157`	`+ protected override object InnerEvaluate(string expression, string documentName)`
`153`	`158`	`{`
`154`	`159`	`object result;`
`155`	`160`
`156`	`161`	`try`
`157`	`162`	`{`
`158`		`- result = _jsEngine.Evaluate(expression);`
	`163`	`+ result = _jsEngine.Evaluate(expression, documentName);`
`159`	`164`	`}`
`160`	`165`	`catch (OriginalJsRuntimeException e)`
`161`	`166`	`{`
`@@ -169,16 +174,26 @@ protected override object InnerEvaluate(string expression)`
`169`	`174`
`170`	`175`	`protected override T InnerEvaluate<T>(string expression)`
`171`	`176`	`{`
`172`		`- object result = InnerEvaluate(expression);`
	`177`	`+ return InnerEvaluate<T>(expression, null);`
	`178`	`+ }`
	`179`	`+`
	`180`	`+ protected override T InnerEvaluate<T>(string expression, string documentName)`
	`181`	`+ {`
	`182`	`+ object result = InnerEvaluate(expression, documentName);`
`173`	`183`
`174`	`184`	`return OriginalTypeConverter.ConvertToType<T>(result);`
`175`	`185`	`}`
`176`	`186`
`177`	`187`	`protected override void InnerExecute(string code)`
	`188`	`+ {`
	`189`	`+ InnerExecute(code, null);`
	`190`	`+ }`
	`191`	`+`
	`192`	`+ protected override void InnerExecute(string code, string documentName)`
`178`	`193`	`{`
`179`	`194`	`try`
`180`	`195`	`{`
`181`		`- _jsEngine.Execute(code);`
	`196`	`+ _jsEngine.Execute(code, documentName);`
`182`	`197`	`}`
`183`	`198`	`catch (OriginalJsRuntimeException e)`
`184`	`199`	`{`