diff --git a/Package.nuspec b/Package.nuspec
index 2a5e6f6..9c1c952 100644
--- a/Package.nuspec
+++ b/Package.nuspec
@@ -2,7 +2,7 @@
NJsonApiCore
- 1.0.7
+ 2.0.0
Rob Lang
Rob Lang
http://brainwipe.github.io/NJsonApiCore
@@ -10,12 +10,14 @@
false
NJsonApiCore extends a ASP.NET json web service so that it returns JSON in the {json:api} format.
Copyright 2016
- 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
+ Changed target to .NET standard 1.6. All issues here: https://github.com/brainwipe/NJsonApiCore/milestone/6?closed=1
jsonapi njsonapi webapi core
+
+
@@ -34,7 +36,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/global.json b/global.json
deleted file mode 100644
index ea6dcc2..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "projects": [ "src", "test" ],
- "sdk": {
- "version": "1.0.0-preview2-003121"
- }
-}
diff --git a/src/NJsonApiCore.Web.MVCCore.HelloWorld/NJsonApiCore.Web.MVCCore.HelloWorld.csproj b/src/NJsonApiCore.Web.MVCCore.HelloWorld/NJsonApiCore.Web.MVCCore.HelloWorld.csproj
index 7914b3b..0f5dc80 100644
--- a/src/NJsonApiCore.Web.MVCCore.HelloWorld/NJsonApiCore.Web.MVCCore.HelloWorld.csproj
+++ b/src/NJsonApiCore.Web.MVCCore.HelloWorld/NJsonApiCore.Web.MVCCore.HelloWorld.csproj
@@ -1,13 +1,12 @@
-
+
- netcoreapp1.0
+ netcoreapp2.0
true
NJsonApiCore.Web.MVCCore.HelloWorld
Exe
NJsonApiCore.Web.MVCCore.HelloWorld
- 1.0.4
- $(PackageTargetFallback);dotnet5.6;portable-net45+win8
+
diff --git a/src/NJsonApiCore.Web.MVCCore/NJsonApiCore.Web.MVCCore.csproj b/src/NJsonApiCore.Web.MVCCore/NJsonApiCore.Web.MVCCore.csproj
index bfc9786..647fb2f 100644
--- a/src/NJsonApiCore.Web.MVCCore/NJsonApiCore.Web.MVCCore.csproj
+++ b/src/NJsonApiCore.Web.MVCCore/NJsonApiCore.Web.MVCCore.csproj
@@ -1,11 +1,9 @@
- netcoreapp1.0
+ netstandard1.6
NJsonApiCore.Web.MVCCore
NJsonApiCore.Web.MVCCore
- 1.6.0
- $(PackageTargetFallback);dotnet5.6;portable-net45+win8
false
false
false
diff --git a/src/NJsonApiCore/NJsonApiCoreCore.csproj b/src/NJsonApiCore/NJsonApiCoreCore.csproj
index c0fa447..306774c 100644
--- a/src/NJsonApiCore/NJsonApiCoreCore.csproj
+++ b/src/NJsonApiCore/NJsonApiCoreCore.csproj
@@ -1,11 +1,9 @@
- netcoreapp1.0
+ netstandard1.6
NJsonApiCore
NJsonApiCore
- 1.6.0
- $(PackageTargetFallback);dotnet5.6;portable-net45+win8
false
false
false
diff --git a/src/NJsonApiCore/Utils/ExpressionUtils.cs b/src/NJsonApiCore/Utils/ExpressionUtils.cs
index 85e7697..5db0c58 100644
--- a/src/NJsonApiCore/Utils/ExpressionUtils.cs
+++ b/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)
{
diff --git a/test/NJsonApiCore.Test/NJsonApiCore.Test.csproj b/test/NJsonApiCore.Test/NJsonApiCore.Test.csproj
index fadad51..42510d2 100644
--- a/test/NJsonApiCore.Test/NJsonApiCore.Test.csproj
+++ b/test/NJsonApiCore.Test/NJsonApiCore.Test.csproj
@@ -1,12 +1,10 @@
- netcoreapp1.0
+ netcoreapp2.0
NJsonApiCore.Test
NJsonApiCore.Test
true
- 1.6.0
- 1.0.4
false
false
false
@@ -24,12 +22,15 @@
-
-
-
-
-
-
+
+
+ all
+ runtime; build; native; contentfiles; analyzers
+
+
+
+
+