From 50ec8d30b6809f6340cf87bf6e611e587252a8b4 Mon Sep 17 00:00:00 2001 From: Bartosz Bukowski Date: Thu, 31 Jan 2019 09:55:49 +0100 Subject: [PATCH 1/4] Changed target to net standard 1.6 --- Package.nuspec | 6 +++--- global.json | 6 ------ ...NJsonApiCore.Web.MVCCore.HelloWorld.csproj | 5 ++--- .../NJsonApiCore.Web.MVCCore.csproj | 4 +--- src/NJsonApiCore/NJsonApiCoreCore.csproj | 4 +--- src/NJsonApiCore/Utils/ExpressionUtils.cs | 17 ----------------- .../NJsonApiCore.Test.csproj | 19 ++++++++++--------- 7 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 global.json diff --git a/Package.nuspec b/Package.nuspec index 2a5e6f6..f04ce1c 100644 --- a/Package.nuspec +++ b/Package.nuspec @@ -2,7 +2,7 @@ NJsonApiCore - 1.0.7 + 1.0.8 Rob Lang Rob Lang http://brainwipe.github.io/NJsonApiCore @@ -34,7 +34,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..0343bb0 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 + + + + + From cecaace8d9a655858c7b35e73b83ff12f29e8bc2 Mon Sep 17 00:00:00 2001 From: Bartosz Bukowski Date: Thu, 31 Jan 2019 15:29:29 +0100 Subject: [PATCH 2/4] Updated package.nuspec --- Package.nuspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Package.nuspec b/Package.nuspec index f04ce1c..f593bb9 100644 --- a/Package.nuspec +++ b/Package.nuspec @@ -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 + + From 652a379f86e13dbd7d5f4d2960d01a34c9badf5b Mon Sep 17 00:00:00 2001 From: Bartosz Bukowski Date: Fri, 1 Feb 2019 08:53:44 +0100 Subject: [PATCH 3/4] Updated Package.nuspec --- Package.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.nuspec b/Package.nuspec index f593bb9..9c1c952 100644 --- a/Package.nuspec +++ b/Package.nuspec @@ -2,7 +2,7 @@ NJsonApiCore - 1.0.8 + 2.0.0 Rob Lang Rob Lang http://brainwipe.github.io/NJsonApiCore From 35eda4fd49b6072663a5ac14b652621545e3c1a0 Mon Sep 17 00:00:00 2001 From: Bartosz Bukowski Date: Fri, 1 Feb 2019 12:35:38 +0100 Subject: [PATCH 4/4] Removed RuntimeFrameworkVersion. --- .../NJsonApiCore.Web.MVCCore.HelloWorld.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0343bb0..0f5dc80 100644 --- a/src/NJsonApiCore.Web.MVCCore.HelloWorld/NJsonApiCore.Web.MVCCore.HelloWorld.csproj +++ b/src/NJsonApiCore.Web.MVCCore.HelloWorld/NJsonApiCore.Web.MVCCore.HelloWorld.csproj @@ -6,7 +6,7 @@ NJsonApiCore.Web.MVCCore.HelloWorld Exe NJsonApiCore.Web.MVCCore.HelloWorld - 1.0.4 +