1. In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 1.7.0;

Taritsyn · Taritsyn · commit 75e3a996d051 · 2016-03-04T20:52:50.000+03:00
2. In JavaScriptEngineSwitcher.V8 added support of Microsoft ClearScript.V8 version of March 2, 2016;
3. In JavaScriptEngineSwitcher.Jurassic added support of Jurassic version of March 4, 2016;
4. In JavaScriptEngineSwitcher.Jint added support of Jint version of March 3, 2016.
diff --git a/Binaries/ClearScript/ClearScript.dll b/Binaries/ClearScript/ClearScript.dll
diff --git a/Binaries/ClearScript/x64/ClearScriptV8-64.dll b/Binaries/ClearScript/x64/ClearScriptV8-64.dll
diff --git a/Binaries/ClearScript/x86/ClearScriptV8-32.dll b/Binaries/ClearScript/x86/ClearScriptV8-32.dll
diff --git a/Binaries/Jint/Jint.dll b/Binaries/Jint/Jint.dll
diff --git a/Binaries/Jint/License.txt b/Binaries/Jint/License.txt
@@ -0,0 +1,12 @@
+BSD 2-Clause License
+
+Copyright (c) 2013, Sebastien Ros
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Binaries/Jurassic/Jurassic.dll b/Binaries/Jurassic/Jurassic.dll
diff --git a/Binaries/Jurassic/License.txt b/Binaries/Jurassic/License.txt
@@ -1,31 +1,21 @@
-﻿Microsoft Public License (Ms-PL)
-
-This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
-
-1. Definitions
-
-The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
-
-A "contribution" is the original software, or any additions or changes to the software.
-
-A "contributor" is any person that distributes its contribution under this license.
-
-"Licensed patents" are a contributor's patent claims that read directly on its contribution.
-
-2. Grant of Rights
-
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
-
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
-
-3. Conditions and Limitations
-
-(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
-
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
-
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
-
-(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
-
-(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
+The MIT License (MIT)
+
+Copyright (c) 2015 Paul Bartrum
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Licenses/jurassic-license.txt b/Licenses/jurassic-license.txt
@@ -1,51 +1,21 @@
-Copyright 2010 Paul Bartrum
+The MIT License (MIT)
 
-Microsoft Public License (Ms-PL) 
- 
-This license governs use of the accompanying software. If you use the software, you accept this license. 
-If you do not accept the license, do not use the software. 
- 
-1. Definitions 
- 
-The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning 
-here as under U.S. copyright law. 
- 
-A "contribution" is the original software, or any additions or changes to the software. 
- 
-A "contributor" is any person that distributes its contribution under this license. 
- 
-"Licensed patents" are a contributor's patent claims that read directly on its contribution. 
- 
-2. Grant of Rights 
- 
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations 
-in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to 
-reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution 
-or any derivative works that you create. 
- 
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in 
-section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed 
-patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its 
-contribution in the software or derivative works of the contribution in the software. 
- 
-3. Conditions and Limitations 
- 
-(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or 
-trademarks. 
- 
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the 
-software, your patent license from such contributor to the software ends automatically. 
- 
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and 
-attribution notices that are present in the software. 
- 
-(D) If you distribute any portion of the software in source code form, you may do so only under this 
-license by including a complete copy of this license with your distribution. If you distribute any portion 
-of the software in compiled or object code form, you may only do so under a license that complies with 
-this license. 
- 
-(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express 
-warranties, guarantees or conditions. You may have additional consumer rights under your local laws 
-which this license cannot change. To the extent permitted under your local laws, the contributors 
-exclude the implied warranties of merchantability, fitness for a particular purpose and non-
-infringement.
+Copyright (c) 2015 Paul Bartrum
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/NuGet/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.nuspec b/NuGet/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.nuspec
@@ -12,13 +12,13 @@
 		<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 MSIE JavaScript Engine version 1.7.0 Beta 1.</releaseNotes>
+		<releaseNotes>Added support of MSIE JavaScript Engine version 1.7.0.</releaseNotes>
 		<copyright>Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScript ECMAScript MSIE IE Chakra</tags>
 		<dependencies>
 			<dependency id="JavaScriptEngineSwitcher.Core" version="1.5.0-beta1" />
-			<dependency id="MsieJavaScriptEngine" version="1.7.0-beta1" />
+			<dependency id="MsieJavaScriptEngine" version="1.7.0" />
 		</dependencies>
 		<references>
 			<reference file="JavaScriptEngineSwitcher.Msie.dll" />
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs b/src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs
@@ -159,10 +159,8 @@ private void Dispose(bool disposing)
 		{
 			lock (_runSynchronizer)
 			{
-				if (!_disposed)
+				if (_disposedFlag.Set())
 				{
-					_disposed = true;
-
 					_jsRuntime.Dispose();
 
 					_externalObjects.Clear();
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj b/src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj
@@ -38,13 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyResolver.cs" />
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsScope.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsScope.cs
@@ -2,6 +2,8 @@
 {
 	using System;
 
+	using Core;
+
 	/// <summary>
 	/// The scope automatically sets a context to current and resets the original context
 	/// when disposed
@@ -16,7 +18,7 @@ internal struct JsScope : IDisposable
 		/// <summary>
 		/// Whether the structure has been disposed
 		/// </summary>
-		private bool _disposed;
+		private StatedFlag _disposedFlag;
 
 
 		/// <summary>
@@ -25,7 +27,7 @@ internal struct JsScope : IDisposable
 		/// <param name="context">The context to create the scope for</param>
 		public JsScope(JsContext context)
 		{
-			_disposed = false;
+			_disposedFlag = new StatedFlag();
 			_previousContext = JsContext.Current;
 
 			JsContext.Current = context;
@@ -39,13 +41,10 @@ public JsScope(JsContext context)
 		/// </summary>
 		public void Dispose()
 		{
-			if (_disposed)
+			if (_disposedFlag.Set())
 			{
-				return;
+				JsContext.Current = _previousContext;
 			}
-
-			JsContext.Current = _previousContext;
-			_disposed = true;
 		}
 
 		#endregion
diff --git a/src/JavaScriptEngineSwitcher.Core/InterlockedStatedFlag.cs b/src/JavaScriptEngineSwitcher.Core/InterlockedStatedFlag.cs
@@ -0,0 +1,20 @@
+﻿namespace JavaScriptEngineSwitcher.Core
+{
+	using System.Threading;
+
+	public struct InterlockedStatedFlag
+	{
+		private int _counter;
+
+
+		public bool IsSet()
+		{
+			return _counter != 0;
+		}
+
+		public bool Set()
+		{
+			return Interlocked.Exchange(ref _counter, 1) == 0;
+		}
+	}
+}
diff --git a/src/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj b/src/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj
@@ -49,6 +49,7 @@
     <Compile Include="Helpers\JsRuntimeErrorHelpers.cs" />
     <Compile Include="Helpers\ValidationHelpers.cs" />
     <Compile Include="IJsEngine.cs" />
+    <Compile Include="InterlockedStatedFlag.cs" />
     <Compile Include="JsEngineBase.cs" />
     <Compile Include="JsEngineLoadException.cs" />
     <Compile Include="JsEngineNotFoundException.cs" />
@@ -67,6 +68,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Strings.ru-ru.resx</DependentUpon>
     </Compile>
+    <Compile Include="StatedFlag.cs" />
     <Compile Include="Undefined.cs" />
     <Compile Include="Utilities\StringBuilderExtensions.cs" />
     <Compile Include="Utilities\TypeConverter.cs" />
diff --git a/src/JavaScriptEngineSwitcher.Core/JsEngineBase.cs b/src/JavaScriptEngineSwitcher.Core/JsEngineBase.cs
@@ -16,12 +16,12 @@ public abstract class JsEngineBase : IJsEngine
 		/// <summary>
 		/// Flag that object is destroyed
 		/// </summary>
-		protected bool _disposed;
+		protected InterlockedStatedFlag _disposedFlag = new InterlockedStatedFlag();
 
 
 		protected void VerifyNotDisposed()
 		{
-			if (_disposed)
+			if (_disposedFlag.IsSet())
 			{
 				throw new ObjectDisposedException(ToString());
 			}
diff --git a/src/JavaScriptEngineSwitcher.Core/StatedFlag.cs b/src/JavaScriptEngineSwitcher.Core/StatedFlag.cs
@@ -0,0 +1,24 @@
+﻿namespace JavaScriptEngineSwitcher.Core
+{
+	public struct StatedFlag
+	{
+		private bool _isSet;
+
+
+		public bool IsSet()
+		{
+			return _isSet;
+		}
+
+		public bool Set()
+		{
+			if (!_isSet)
+			{
+				_isSet = true;
+				return true;
+			}
+
+			return false;
+		}
+	}
+}
diff --git a/src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs b/src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs
@@ -32,7 +32,7 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JavaScript engine
 		/// </summary>
-		private const string ENGINE_VERSION = "Feb 18, 2016";
+		private const string ENGINE_VERSION = "Mar 3, 2016";
 
 		/// <summary>
 		/// Jint JS engine
@@ -449,10 +449,8 @@ protected override void InnerEmbedHostType(string itemName, Type type)
 
 		public override void Dispose()
 		{
-			if (!_disposed)
+			if (_disposedFlag.Set())
 			{
-				_disposed = true;
-
 				_jsEngine = null;
 			}
 		}
diff --git a/src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj b/src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj
@@ -43,7 +43,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Jurassic, Version=2.1.0.0, Culture=neutral, PublicKeyToken=67039d2c577b4c08, processorArchitecture=MSIL">
+    <Reference Include="Jurassic, Version=3.0.0.0, Culture=neutral, PublicKeyToken=42f272f6dd312a2c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Binaries\Jurassic\Jurassic.dll</HintPath>
     </Reference>
diff --git a/src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs b/src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs
@@ -30,7 +30,7 @@ public sealed class JurassicJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JavaScript engine
 		/// </summary>
-		private const string ENGINE_VERSION = "Feb 24, 2016";
+		private const string ENGINE_VERSION = "Mar 4, 2016";
 
 		/// <summary>
 		/// Jurassic JS engine
@@ -347,10 +347,8 @@ public override void ExecuteFile(string path, Encoding encoding = null)
 
 		public override void Dispose()
 		{
-			if (!_disposed)
+			if (_disposedFlag.Set())
 			{
-				_disposed = true;
-
 				_jsEngine = null;
 			}
 		}
diff --git a/src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj b/src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj
@@ -46,7 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MsieJavaScriptEngine, Version=1.7.0.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MsieJavaScriptEngine.1.7.0-beta1\lib\net40\MsieJavaScriptEngine.dll</HintPath>
+      <HintPath>..\..\packages\MsieJavaScriptEngine.1.7.0\lib\net40\MsieJavaScriptEngine.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/JavaScriptEngineSwitcher.Msie/MsieJsEngine.cs b/src/JavaScriptEngineSwitcher.Msie/MsieJsEngine.cs
@@ -316,10 +316,8 @@ protected override void InnerEmbedHostType(string itemName, Type type)
 
 		public override void Dispose()
 		{
-			if (!_disposed)
+			if (_disposedFlag.Set())
 			{
-				_disposed = true;
-
 				if (_jsEngine != null)
 				{
 					_jsEngine.Dispose();
diff --git a/src/JavaScriptEngineSwitcher.Msie/packages.config b/src/JavaScriptEngineSwitcher.Msie/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MsieJavaScriptEngine" version="1.7.0-beta1" targetFramework="net40-Client" />
+  <package id="MsieJavaScriptEngine" version="1.7.0" targetFramework="net40-Client" />
 </packages>
diff --git a/src/JavaScriptEngineSwitcher.V8/V8JsEngine.cs b/src/JavaScriptEngineSwitcher.V8/V8JsEngine.cs
@@ -437,10 +437,8 @@ protected override void InnerEmbedHostType(string itemName, Type type)
 
 		public override void Dispose()
 		{
-			if (!_disposed)
+			if (_disposedFlag.Set())
 			{
-				_disposed = true;
-
 				if (_jsEngine != null)
 				{
 					_jsEngine.Dispose();

Original file line number	Diff line number	Diff line change
`@@ -159,10 +159,8 @@ private void Dispose(bool disposing)`
`159`	`159`	`{`
`160`	`160`	`lock (_runSynchronizer)`
`161`	`161`	`{`
`162`		`- if (!_disposed)`
	`162`	`+ if (_disposedFlag.Set())`
`163`	`163`	`{`
`164`		`- _disposed = true;`
`165`		`-`
`166`	`164`	`_jsRuntime.Dispose();`
`167`	`165`
`168`	`166`	`_externalObjects.Clear();`