Changed target to net standard 1.6

Package.nuspec

@@ -2,20 +2,22 @@
 <package>
   <metadata>
     <id>NJsonApiCore</id>
-    <version>1.0.7</version>
+    <version>2.0.0</version>
     <authors>Rob Lang</authors>
     <owners>Rob Lang</owners>
     <projectUrl>http://brainwipe.github.io/NJsonApiCore</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/brainwipe/NJsonApiCore/gh-pages/images/njsonapi.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>NJsonApiCore extends a ASP.NET json web service so that it returns JSON in the {json:api} format. </description>
     <copyright>Copyright 2016</copyright>
-    <releaseNotes>Added support for Array return types, allowed JsonApi services to run alongside non-JsonApi services. All issues here: https://github.com/brainwipe/NJsonApiCore/milestone/6?closed=1</releaseNotes>
+    <releaseNotes>Changed target to .NET standard 1.6. All issues here: https://github.com/brainwipe/NJsonApiCore/milestone/6?closed=1</releaseNotes>
     <tags>jsonapi njsonapi webapi core</tags>
     <dependencies>
       <group targetFramework="dotnet">
         <dependency id="Humanizer.Core" version="2.1.0" />
         <dependency id="Newtonsoft.Json" version="9.0.1" />
+        <dependency id="Microsoft.AspNetCore.Mvc" version="1.0.3" />
+        <dependency id="Microsoft.AspNetCore.Mvc.Core" version="1.0.3" />
       </group>
       <group targetFramework="net452">
         <dependency id="CommonServiceLocator" version="1.3.0" />
@@ -34,7 +36,7 @@
   <files>
     <file src="artifacts\src\NJsonApiCore.Web.MVC5\bin\release\net452\NJsonApiCore.dll" target="lib/net452" />
     <file src="artifacts\src\NJsonApiCore.Web.MVC5\bin\release\net452\NJsonApiCore.Web.MVC5.dll" target="lib/net452" />
-    <file src="artifacts\src\NJsonApiCore.Web.MVCCore\bin\Release\netcoreapp1.0\NJsonApiCore.dll" target="lib/dotnet" />
-    <file src="artifacts\src\NJsonApiCore.Web.MVCCore\bin\Release\netcoreapp1.0\NJsonApiCore.Web.MVCCore.dll" target="lib/dotnet" />
+    <file src="artifacts\src\NJsonApiCore.Web.MVCCore\bin\Release\netstandard1.6\NJsonApiCore.dll" target="lib/dotnet" />
+    <file src="artifacts\src\NJsonApiCore.Web.MVCCore\bin\Release\netstandard1.6\NJsonApiCore.Web.MVCCore.dll" target="lib/dotnet" />
   </files>
 </package>

src/NJsonApiCore.Web.MVCCore.HelloWorld/NJsonApiCore.Web.MVCCore.HelloWorld.csproj

@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>NJsonApiCore.Web.MVCCore.HelloWorld</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>NJsonApiCore.Web.MVCCore.HelloWorld</PackageId>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
-    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
+
   </PropertyGroup>
 
   <ItemGroup>

src/NJsonApiCore.Web.MVCCore/NJsonApiCore.Web.MVCCore.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netstandard1.6</TargetFramework>
     <AssemblyName>NJsonApiCore.Web.MVCCore</AssemblyName>
     <PackageId>NJsonApiCore.Web.MVCCore</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
-    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>

src/NJsonApiCore/NJsonApiCoreCore.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netstandard1.6</TargetFramework>
     <AssemblyName>NJsonApiCore</AssemblyName>
     <PackageId>NJsonApiCore</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
-    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

src/NJsonApiCore/Utils/ExpressionUtils.cs

@@ -10,28 +10,11 @@ namespace NJsonApi.Utils
 {
     public static class ExpressionUtils
     {
-#if (NETCOREAPP1_0)
         // JObject.ToObject(value) method info
         private static readonly MethodInfo JObjectToObjectMethodInfo =
             typeof(JObject).GetMethods().Single(x => x.Name == "ToObject" && !x.ContainsGenericParameters && x.GetParameters().Length == 1);
         private static readonly MethodInfo JArrayToObjectMethodInfo =
             typeof(JArray).GetMethods().Single(x => x.Name == "ToObject" && !x.ContainsGenericParameters && x.GetParameters().Length == 1);
-#else
-        // JObject.ToObject(value) method info
-        private static readonly MethodInfo JObjectToObjectMethodInfo =
-            typeof(JObject).GetMethod("ToObject",
-            BindingFlags.Instance | BindingFlags.Public,
-            null,
-            CallingConventions.HasThis,
-            new[] { typeof(Type) }, null);
-
-        private static readonly MethodInfo JArrayToObjectMethodInfo =
-            typeof(JArray).GetMethod("ToObject",
-            BindingFlags.Instance | BindingFlags.Public,
-            null,
-            CallingConventions.HasThis,
-            new[] { typeof(Type) }, null);
-#endif
 
         public static PropertyInfo GetPropertyInfo(this LambdaExpression propertyExpression)
         {

test/NJsonApiCore.Test/NJsonApiCore.Test.csproj

@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>NJsonApiCore.Test</AssemblyName>
     <PackageId>NJsonApiCore.Test</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -24,12 +22,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.0.3" />
-    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
-    <PackageReference Include="Moq" Version="4.6.36-alpha" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Moq" Version="4.10.1" />
   </ItemGroup>
 
   <ItemGroup>