From f3c7b335957ac429dd4ce68b9b72cf693ff1df6c Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 1 Mar 2016 13:37:10 -0800 Subject: [PATCH] Transition to netstandard. - dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs. --- samples/StaticFileSample/project.json | 10 +++++++--- src/Microsoft.AspNetCore.StaticFiles/project.json | 10 ++++++++-- .../project.json | 7 +++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/samples/StaticFileSample/project.json b/samples/StaticFileSample/project.json index 6f8991506c..55696e4019 100644 --- a/samples/StaticFileSample/project.json +++ b/samples/StaticFileSample/project.json @@ -13,10 +13,14 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "dnx451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } }, "content": [ "wwwroot/**/*" ] -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.StaticFiles/project.json b/src/Microsoft.AspNetCore.StaticFiles/project.json index ba26109a93..b9b2698941 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/project.json +++ b/src/Microsoft.AspNetCore.StaticFiles/project.json @@ -3,7 +3,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "description": "ASP.NET 5 static files middleware.", @@ -20,6 +22,10 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": {} + "netstandard1.3": { + "imports": [ + "dotnet5.4" + ] + } } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json b/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json index 8cbc52a791..6c53911102 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json @@ -16,11 +16,14 @@ "xunit": "2.1.0" }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] }, "net451": { "frameworkAssemblies": {