In JavaScriptEngineSwitcher.ChakraCore added a netcoreapp2.1 target

Author: Taritsyn

build/common.props

@@ -13,7 +13,7 @@
 		<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'netcoreapp2.1' ">
 		<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
 	</PropertyGroup>
 </Project>

src/JavaScriptEngineSwitcher.ChakraCore/AssemblyResolver.cs

@@ -1,4 +1,4 @@
-#if !NETSTANDARD
+#if NETFULL
 using System;
 using System.IO;
 using System.Runtime.InteropServices;

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

@@ -101,7 +101,7 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// </summary>
 		private readonly UniqueDocumentNameManager _documentNameManager =
 			new UniqueDocumentNameManager(DefaultDocumentName);
-#if !NETSTANDARD
+#if NETFULL
 
 		/// <summary>
 		/// Synchronizer of JS engine initialization
@@ -128,7 +128,7 @@ public ChakraCoreJsEngine()
 		/// <param name="settings">Settings of the ChakraCore JS engine</param>
 		public ChakraCoreJsEngine(ChakraCoreSettings settings)
 		{
-#if !NETSTANDARD
+#if NETFULL
 			Initialize();
 
 #endif
@@ -207,7 +207,7 @@ public ChakraCoreJsEngine(ChakraCoreSettings settings)
 			Dispose(false);
 		}
 
-#if !NETSTANDARD
+#if NETFULL
 
 		/// <summary>
 		/// Initializes a JS engine

src/JavaScriptEngineSwitcher.ChakraCore/Helpers/EncodingHelpers.cs

@@ -1,4 +1,4 @@
-#if NET471 || NETSTANDARD
+#if NET471 || NETSTANDARD || NETCOREAPP2_1
 using System;
 using System.Runtime.InteropServices;
 #endif
@@ -11,7 +11,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.Helpers
 	/// </summary>
 	internal static class EncodingHelpers
 	{
-#if NET471 || NETSTANDARD
+#if NET471 || NETSTANDARD || NETCOREAPP2_1
 		public static unsafe string UnicodeToUtf8(string value, out int byteCount)
 #else
 		public static string UnicodeToUtf8(string value, out int byteCount)
@@ -24,7 +24,7 @@ public static string UnicodeToUtf8(string value, out int byteCount)
 			}
 
 			string result;
-#if NET471 || NETSTANDARD
+#if NET471 || NETSTANDARD || NETCOREAPP2_1
 			byteCount = Encoding.UTF8.GetByteCount(value);
 			IntPtr bufferPtr = Marshal.AllocHGlobal(byteCount);
 

src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj

@@ -4,7 +4,7 @@
 		<Product>JS Engine Switcher: ChakraCore</Product>
 		<VersionPrefix>3.0.0</VersionPrefix>
 		<VersionSuffix>rc1</VersionSuffix>
-		<TargetFrameworks>net40-client;net45;net471;netstandard1.3;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net40-client;net45;net471;netstandard1.3;netstandard2.0;netcoreapp2.1</TargetFrameworks>
 		<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
 		<OutputType>Library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -23,7 +23,8 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_ChakraCore_Logo128x128.png</PackageIconUrl>
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;ChakraCore</PackageTags>
-		<PackageReleaseNotes>In the `NativeMethods` class for the `netstandard` targets was changed a calling convention from `StdCall` to `Cdecl`.</PackageReleaseNotes>
+		<PackageReleaseNotes>1. In the `NativeMethods` class for the `netstandard` and `netcoreapp` targets was changed a calling convention from `StdCall` to `Cdecl`;
+2. Added a `netcoreapp2.1` target.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsContext.cs

@@ -1,5 +1,5 @@
 using System;
-#if NET45 || NET471 || NETSTANDARD
+#if NET45 || NET471 || NETSTANDARD || NETCOREAPP2_1
 using System.Runtime.InteropServices;
 #endif
 using System.Text;

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsPropertyId.cs

@@ -1,5 +1,5 @@
 using System;
-#if NET45 || NET471 || NETSTANDARD
+#if NET45 || NET471 || NETSTANDARD || NETCOREAPP2_1
 using System.Buffers;
 using System.Runtime.InteropServices;
 #endif

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsValue.cs

@@ -1,5 +1,5 @@
 using System;
-#if NET45 || NET471 || NETSTANDARD
+#if NET45 || NET471 || NETSTANDARD || NETCOREAPP2_1
 using System.Buffers;
 #endif
 using System.Runtime.InteropServices;

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/NativeMethods.cs

@@ -10,7 +10,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 	/// </summary>
 	internal static class NativeMethods
 	{
-#if NETSTANDARD
+#if NETSTANDARD || NETCOREAPP2_1
 		private const CallingConvention DefaultCallingConvention = CallingConvention.Cdecl;
 #else
 		private const CallingConvention DefaultCallingConvention = CallingConvention.StdCall;

src/JavaScriptEngineSwitcher.ChakraCore/ScriptDispatcher.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-#if NET45 || NET471 || NETSTANDARD
+#if NET45 || NET471 || NETSTANDARD || NETCOREAPP2_1
 using System.Runtime.ExceptionServices;
 #endif
 using System.Threading;
@@ -155,7 +155,7 @@ private object InnnerInvoke(Func<object> del)
 			Exception exception = task.Exception;
 			if (exception != null)
 			{
-#if NET45 || NET471 || NETSTANDARD
+#if NET45 || NET471 || NETSTANDARD || NETCOREAPP2_1
 				ExceptionDispatchInfo.Capture(exception).Throw();
 #elif NET40
 				exception.PreserveStackTrace();