Merge pull request #30 from Taritsyn/master

Added a `net471` and `netstandard2.0` targets

Author: Daniel15

global.json

@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0"
+    "version": "2.0.0"
   }
 }

src/JSPool.Example.Console/JSPool.Example.Console.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net451;net471;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>JSPool.Example.Console</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>JSPool.Example.Console</PackageId>
@@ -26,15 +26,13 @@
     <PackageReference Include="JavaScriptEngineSwitcher.Core" Version="3.0.0-beta4" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net471' ">
     <PackageReference Include="JavaScriptEngineSwitcher.V8" Version="3.0.0-beta4" />
     <PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x64" Version="3.0.0-beta3" />
     <PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x86" Version="3.0.0-beta3" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore" Version="3.0.0-beta5" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.0.0-beta3" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.0.0-beta3" />

src/JSPool.Example.Console/Program.cs

@@ -8,7 +8,7 @@
 using System;
 using JavaScriptEngineSwitcher.Core;
 
-#if NETCOREAPP1_0
+#if NETCOREAPP1_0 || NETCOREAPP2_0
 using JavaScriptEngineSwitcher.ChakraCore;
 #else
 using JavaScriptEngineSwitcher.V8;
@@ -23,7 +23,7 @@ static void Main(string[] args)
 			// Configure JavaScriptEngineSwitcher. Generally V8 is preferred, however
 			// it's currently not supported on .NET Core.
 			IJsEngineSwitcher engineSwitcher = JsEngineSwitcher.Current;
-#if NETCOREAPP1_0
+#if NETCOREAPP1_0 || NETCOREAPP2_0
 			engineSwitcher.EngineFactories.AddChakraCore();
 			engineSwitcher.DefaultEngineName = ChakraCoreJsEngine.EngineName;
 #else

src/JSPool/JSPool.csproj

@@ -7,7 +7,7 @@ See https://dan.cx/projects/jspool for usage instructions.</Description>
     <Copyright>Daniel Lo Nigro</Copyright>
     <PackageIconUrl>https://stuff.dan.cx/images/projects/jspool-logo-256.png</PackageIconUrl>
     <VersionPrefix>3.0.1</VersionPrefix>
-    <TargetFrameworks>net40-client;net451;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40-client;net451;net471;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>JSPool</AssemblyName>
     <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>

tests/JSPool.Tests/JSPool.Tests.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFrameworks>net452;net471;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>JSPool.Tests</AssemblyName>
     <PackageId>JSPool.Tests</PackageId>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -19,16 +20,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
-    <PackageReference Include="Moq" Version="4.5.21" />
-    <PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-build1317" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="Moq" Version="4.8.3" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
 </Project>