From f9b9dcd79b0687bb1c6abfc790369ec2a9808e7e Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 1 Mar 2016 13:36:35 -0800 Subject: [PATCH] Transition to netstandard. - dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs. --- samples/AntiforgerySample/project.json | 16 +++++++--------- .../project.json | 12 +++++++++--- .../project.json | 7 +++++-- .../project.json | 9 ++++++--- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/samples/AntiforgerySample/project.json b/samples/AntiforgerySample/project.json index 761ce827e4..db44c51ba6 100644 --- a/samples/AntiforgerySample/project.json +++ b/samples/AntiforgerySample/project.json @@ -1,6 +1,5 @@ { "version": "1.0.0-*", - "dependencies": { "Microsoft.AspNetCore.Antiforgery": "1.0.0-*", "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*", @@ -11,22 +10,21 @@ "Microsoft.NETCore.Platforms": "1.0.1-*", "Newtonsoft.Json": "8.0.2" }, - "compilationOptions": { "emitEntryPoint": true }, - "commands": { "web": "AntiforgerySample" }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { - "imports": "portable-net451+win8" + "dnx451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } }, - "publishExclude": [ "node_modules", "bower_components", @@ -39,4 +37,4 @@ "node_modules", "bower_components" ] -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Antiforgery/project.json b/src/Microsoft.AspNetCore.Antiforgery/project.json index 4fcfc49f40..e920a5da1a 100644 --- a/src/Microsoft.AspNetCore.Antiforgery/project.json +++ b/src/Microsoft.AspNetCore.Antiforgery/project.json @@ -4,7 +4,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "repository": { @@ -17,7 +19,11 @@ "Microsoft.Extensions.ObjectPool": "1.0.0-*" }, "frameworks": { - "dotnet5.4": { }, - "net451": { } + "netstandard1.3": { + "imports": [ + "dotnet5.4" + ] + }, + "net451": {} } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json index a2a1bfdb71..3c3384faca 100644 --- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json @@ -7,13 +7,16 @@ }, "testRunner": "xunit", "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { "dependencies": { "moq.netcore": "4.4.0-beta8", "System.Net.Http": "4.0.1-*", "dotnet-test-xunit": "1.0.0-dev-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] }, "dnx451": { "dependencies": { diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json b/test/Microsoft.AspNetCore.Antiforgery.Test/project.json index 3f7b9441f3..47ba8e76bf 100644 --- a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json +++ b/test/Microsoft.AspNetCore.Antiforgery.Test/project.json @@ -15,12 +15,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" + ] }, "dnx451": { "frameworkAssemblies": { @@ -32,4 +35,4 @@ } } } -} +} \ No newline at end of file