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

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.nuspec

@@ -13,22 +13,22 @@
 		<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>1. Added support of .NET Core 1.0.4;
-2. Added support of MSIE JavaScript Engine version 2.2.0.</releaseNotes>
+2. Added support of MSIE JavaScript Engine version 2.2.1.</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.2.0" />
+				<dependency id="MsieJavaScriptEngine" version="2.2.1" />
 				<dependency id="JavaScriptEngineSwitcher.Core" version="2.2.0" />
 			</group>
 			<group targetFramework=".NETFramework4.5">
-				<dependency id="MsieJavaScriptEngine" version="2.2.0" />
+				<dependency id="MsieJavaScriptEngine" version="2.2.1" />
 				<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.2.0" />
+				<dependency id="MsieJavaScriptEngine" version="2.2.1" />
 				<dependency id="JavaScriptEngineSwitcher.Core" version="2.2.0" />
 			</group>
 		</dependencies>

NuGet/JavaScriptEngineSwitcher.Msie/readme.txt

@@ -20,7 +20,7 @@
    RELEASE NOTES
    =============
    1. Added support of .NET Core 1.0.4;
-   2. Added support of MSIE JavaScript Engine version 2.2.0.
+   2. Added support of MSIE JavaScript Engine version 2.2.1.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs

@@ -395,6 +395,12 @@ public override void ExecuteFile(string path, Encoding encoding = null)
 		{
 			VerifyNotDisposed();
 
+			if (path == null)
+			{
+				throw new ArgumentNullException(
+					"path", string.Format(CoreStrings.Common_ArgumentIsNull, "path"));
+			}
+
 			if (string.IsNullOrWhiteSpace(path))
 			{
 				throw new ArgumentException(

src/JavaScriptEngineSwitcher.Msie.Net4/JavaScriptEngineSwitcher.Msie.Net40.csproj

@@ -45,8 +45,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <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>
+    <Reference Include="MsieJavaScriptEngine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MsieJavaScriptEngine.2.2.1\lib\net40-client\MsieJavaScriptEngine.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/JavaScriptEngineSwitcher.Msie.Net4/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MsieJavaScriptEngine" version="2.2.0" targetFramework="net40-Client" />
+  <package id="MsieJavaScriptEngine" version="2.2.1" targetFramework="net40-Client" />
 </packages>

src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj

@@ -23,7 +23,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MsieJavaScriptEngine" Version="2.2.0" />
+		<PackageReference Include="MsieJavaScriptEngine" Version="2.2.1" />
 
 		<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
 	</ItemGroup>

src/JavaScriptEngineSwitcher.Msie/MsieJsEngine.cs

@@ -1,4 +1,7 @@
 using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
 
 using OriginalJsEngine = MsieJavaScriptEngine.MsieJsEngine;
 using OriginalJsEngineLoadException = MsieJavaScriptEngine.JsEngineLoadException;
@@ -334,6 +337,102 @@ protected override void InnerCollectGarbage()
 			_jsEngine.CollectGarbage();
 		}
 
+		public override void ExecuteFile(string path, Encoding encoding = null)
+		{
+			VerifyNotDisposed();
+
+			if (path == null)
+			{
+				throw new ArgumentNullException(
+					"path", string.Format(CoreStrings.Common_ArgumentIsNull, "path"));
+			}
+
+			if (string.IsNullOrWhiteSpace(path))
+			{
+				throw new ArgumentException(
+					string.Format(CoreStrings.Common_ArgumentIsEmpty, "path"), "path");
+			}
+
+			if (!File.Exists(path))
+			{
+				throw new FileNotFoundException(
+					string.Format(CoreStrings.Common_FileNotExist, path), path);
+			}
+
+			try
+			{
+				_jsEngine.ExecuteFile(path, encoding);
+			}
+			catch (OriginalJsRuntimeException e)
+			{
+				throw ConvertMsieJsRuntimeExceptionToJsRuntimeException(e);
+			}
+		}
+
+		public override void ExecuteResource(string resourceName, Type type)
+		{
+			VerifyNotDisposed();
+
+			if (resourceName == null)
+			{
+				throw new ArgumentNullException(
+					"resourceName", string.Format(CoreStrings.Common_ArgumentIsNull, "resourceName"));
+			}
+
+			if (type == null)
+			{
+				throw new ArgumentNullException(
+					"type", string.Format(CoreStrings.Common_ArgumentIsNull, "type"));
+			}
+
+			if (string.IsNullOrWhiteSpace(resourceName))
+			{
+				throw new ArgumentException(
+					string.Format(CoreStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+			}
+
+			try
+			{
+				_jsEngine.ExecuteResource(resourceName, type);
+			}
+			catch (OriginalJsRuntimeException e)
+			{
+				throw ConvertMsieJsRuntimeExceptionToJsRuntimeException(e);
+			}
+		}
+
+		public override void ExecuteResource(string resourceName, Assembly assembly)
+		{
+			VerifyNotDisposed();
+
+			if (resourceName == null)
+			{
+				throw new ArgumentNullException(
+					"resourceName", string.Format(CoreStrings.Common_ArgumentIsNull, "resourceName"));
+			}
+
+			if (assembly == null)
+			{
+				throw new ArgumentNullException(
+					"assembly", string.Format(CoreStrings.Common_ArgumentIsNull, "assembly"));
+			}
+
+			if (string.IsNullOrWhiteSpace(resourceName))
+			{
+				throw new ArgumentException(
+					string.Format(CoreStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+			}
+
+			try
+			{
+				_jsEngine.ExecuteResource(resourceName, assembly);
+			}
+			catch (OriginalJsRuntimeException e)
+			{
+				throw ConvertMsieJsRuntimeExceptionToJsRuntimeException(e);
+			}
+		}
+
 		#endregion
 
 		#region IDisposable implementation