From 8c293934e874addfcdcfc3859592dc1ac3de210d Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 1 Mar 2016 13:32:25 -0800 Subject: [PATCH] Transition to netstandard. - dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs. --- src/Microsoft.AspNetCore.JsonPatch/project.json | 13 +++++++++---- .../project.json | 7 +++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.JsonPatch/project.json b/src/Microsoft.AspNetCore.JsonPatch/project.json index 91adf85b87..6e66884725 100644 --- a/src/Microsoft.AspNetCore.JsonPatch/project.json +++ b/src/Microsoft.AspNetCore.JsonPatch/project.json @@ -3,7 +3,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "repository": { @@ -15,7 +17,7 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "Microsoft.CSharp": "4.0.1-*", "System.Collections.Concurrent": "4.0.12-*", @@ -27,7 +29,10 @@ "System.Runtime.Serialization.Primitives": "4.1.0-*", "System.Text.Encoding.Extensions": "4.0.11-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json index cd04e92bb2..6bfaeafb67 100644 --- a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json +++ b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json @@ -10,12 +10,15 @@ }, "testRunner": "xunit", "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] }, "net451": { "frameworkAssemblies": {