1. JsRuntimeErrorHelpers class was renamed to JsErrorHelpers class;

2. Was made refactoring.

Author: Taritsyn

src/JavaScriptEngineSwitcher.ChakraCore/AssemblyResolver.cs

@@ -7,6 +7,7 @@
 #endif
 
 using JavaScriptEngineSwitcher.Core.Helpers;
+using JavaScriptEngineSwitcher.Core.Utilities;
 
 using JavaScriptEngineSwitcher.ChakraCore.Resources;
 
@@ -30,12 +31,11 @@ internal static class AssemblyResolver
 		/// </summary>
 		public static void Initialize()
 		{
+			bool is64BitProcess = Utils.Is64BitProcess();
 			string baseDirectoryPath;
-			bool is64BitProcess;
 
 #if NETSTANDARD1_3
 			baseDirectoryPath = PlatformServices.Default.Application.ApplicationBasePath;
-			is64BitProcess = IntPtr.Size == 8;
 #else
 			AppDomain currentDomain = AppDomain.CurrentDomain;
 			baseDirectoryPath = currentDomain.SetupInformation.PrivateBinPath;
@@ -45,7 +45,6 @@ public static void Initialize()
 				// need to use the `BaseDirectory` property
 				baseDirectoryPath = currentDomain.BaseDirectory;
 			}
-			is64BitProcess = Environment.Is64BitProcess;
 #endif
 
 			if (!PathHelpers.ContainsDirectory(baseDirectoryPath, "bin"))

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

@@ -50,7 +50,7 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// <summary>
 		/// List of external objects
 		/// </summary>
-		private ISet<object> _externalObjects = new HashSet<object>();
+		private readonly HashSet<object> _externalObjects = new HashSet<object>();
 
 		/// <summary>
 		/// Callback for finalization of external object
@@ -60,7 +60,7 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// <summary>
 		/// List of native function callbacks
 		/// </summary>
-		private ISet<JsNativeFunction> _nativeFunctions = new HashSet<JsNativeFunction>();
+		private readonly HashSet<JsNativeFunction> _nativeFunctions = new HashSet<JsNativeFunction>();
 
 		/// <summary>
 		/// Gets a name of JS engine
@@ -92,6 +92,8 @@ static ChakraCoreJsEngine()
 		/// </summary>
 		public ChakraCoreJsEngine()
 		{
+			_externalObjectFinalizeCallback = ExternalObjectFinalizeCallback;
+
 			try
 			{
 				_jsRuntime = JsRuntime.Create(JsRuntimeAttributes.AllowScriptInterrupt, JsRuntimeVersion.VersionEdge, null);
@@ -103,8 +105,6 @@ public ChakraCoreJsEngine()
 					string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
 						EngineName, e.Message), EngineName, EngineVersion, e);
 			}
-
-			_externalObjectFinalizeCallback = ExternalObjectFinalizeCallback;
 		}
 
 		/// <summary>
@@ -164,13 +164,11 @@ private void Dispose(bool disposing)
 					if (_externalObjects != null)
 					{
 						_externalObjects.Clear();
-						_externalObjects = null;
 					}
 
 					if (_nativeFunctions != null)
 					{
 						_nativeFunctions.Clear();
-						_nativeFunctions = null;
 					}
 
 					_externalObjectFinalizeCallback = null;
@@ -346,7 +344,10 @@ private void ExternalObjectFinalizeCallback(IntPtr data)
 
 			lock (_executionSynchronizer)
 			{
-				_externalObjects.Remove(obj);
+				if (_externalObjects != null)
+				{
+					_externalObjects.Remove(obj);
+				}
 			}
 		}
 

src/JavaScriptEngineSwitcher.Core/Helpers/JsRuntimeErrorHelpers.cs renamed to src/JavaScriptEngineSwitcher.Core/Helpers/JsErrorHelpers.cs

@@ -10,7 +10,7 @@ namespace JavaScriptEngineSwitcher.Core.Helpers
 	/// <summary>
 	/// JS error helpers
 	/// </summary>
-	public static class JsRuntimeErrorHelpers
+	public static class JsErrorHelpers
 	{
 		/// <summary>
 		/// Generates a detailed error message

src/JavaScriptEngineSwitcher.Core/Helpers/ValidationHelpers.cs

@@ -22,7 +22,7 @@ public static class ValidationHelpers
 		/// <summary>
 		/// List of primitive type codes
 		/// </summary>
-		private static readonly TypeCode[] _primitiveTypeCodes = new[]
+		private static readonly TypeCode[] _primitiveTypeCodes =
 		{
 			TypeCode.Boolean,
 			TypeCode.SByte, TypeCode.Byte,

src/JavaScriptEngineSwitcher.Core/Utilities/DelegateExtensions.cs

@@ -1,4 +1,5 @@
-using System;
+#if NET40
+using System;
 using System.Reflection;
 
 namespace JavaScriptEngineSwitcher.Core.Utilities
@@ -23,4 +24,5 @@ public static MethodInfo GetMethodInfo(this Delegate source)
 			return source.Method;
 		}
 	}
-}
+}
+#endif

src/JavaScriptEngineSwitcher.Core/Utilities/TypeInfo.cs

@@ -1,4 +1,5 @@
-using System;
+#if NET40
+using System;
 using System.Reflection;
 
 namespace JavaScriptEngineSwitcher.Core.Utilities
@@ -65,4 +66,5 @@ public bool IsInstanceOfType(object o)
 			return _type.IsInstanceOfType(o);
 		}
 	}
-}
+}
+#endif

src/JavaScriptEngineSwitcher.Core/Utilities/Utils.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text;
 
 using JavaScriptEngineSwitcher.Core.Resources;
@@ -9,6 +10,22 @@ namespace JavaScriptEngineSwitcher.Core.Utilities
 {
 	public static class Utils
 	{
+		/// <summary>
+		/// Determines whether the current process is a 64-bit process
+		/// </summary>
+		/// <returns>true if the process is 64-bit; otherwise, false</returns>
+		[MethodImpl((MethodImplOptions)256 /* AggressiveInlining */)]
+		public static bool Is64BitProcess()
+		{
+#if NETSTANDARD1_3
+			bool is64Bit = IntPtr.Size == 8;
+#else
+			bool is64Bit = Environment.Is64BitProcess;
+#endif
+
+			return is64Bit;
+		}
+
 		/// <summary>
 		/// Gets a content of the embedded resource as string
 		/// </summary>

src/JavaScriptEngineSwitcher.Msie/JsEngineMode.cs

@@ -14,13 +14,15 @@ public enum JsEngineMode
 		/// Classic MSIE JavaScript engine (supports ECMAScript 3 with
 		/// possibility of using the ECMAScript 5 Polyfill and the JSON2 library).
 		/// Requires Internet Explorer 6 or higher on the machine.
+		/// Not supported in version for .NET Core.
 		/// </summary>
 		Classic,
 
 		/// <summary>
 		/// ActiveScript version of Chakra JavaScript engine (supports ECMAScript 3
 		/// with possibility of using the ECMAScript 5 Polyfill and the JSON2 library).
 		/// Requires Internet Explorer 9 or higher on the machine.
+		/// Not supported in version for .NET Core.
 		/// </summary>
 		ChakraActiveScript,
 

test/JavaScriptEngineSwitcher.Tests/Interop/Drawing/Color.cs

@@ -1,4 +1,5 @@
-using System;
+#if NETCOREAPP1_0
+using System;
 using System.Text;
 
 namespace JavaScriptEngineSwitcher.Tests.Interop.Drawing
@@ -382,4 +383,5 @@ public override string ToString()
 			return sb.ToString();
 		}
 	}
-}
+}
+#endif

test/JavaScriptEngineSwitcher.Tests/Interop/Drawing/KnownColor.cs

@@ -1,4 +1,5 @@
-namespace JavaScriptEngineSwitcher.Tests.Interop.Drawing
+#if NETCOREAPP1_0
+namespace JavaScriptEngineSwitcher.Tests.Interop.Drawing
 {
 	/// <summary>
 	/// Specifies the known system colors
@@ -7,4 +8,5 @@ public enum KnownColor
 	{
 		OrangeRed = 128
 	}
-}
+}
+#endif