From 5f2f4340349a2eba1cb88e97a49b58d376d2a4ec Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 1 Mar 2016 13:40:42 -0800 Subject: [PATCH] Transition to netstandard. - dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs. --- .../project.json | 9 +++-- src/dotnet-watch/project.json | 39 ++++++++++--------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/Microsoft.DotNet.Watcher.Core/project.json b/src/Microsoft.DotNet.Watcher.Core/project.json index cb07bfea11..5173d391fc 100644 --- a/src/Microsoft.DotNet.Watcher.Core/project.json +++ b/src/Microsoft.DotNet.Watcher.Core/project.json @@ -19,8 +19,11 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } -} +} \ No newline at end of file diff --git a/src/dotnet-watch/project.json b/src/dotnet-watch/project.json index dbe7a7ec35..63233488f7 100644 --- a/src/dotnet-watch/project.json +++ b/src/dotnet-watch/project.json @@ -1,20 +1,23 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "warningsAsErrors": true, - "emitEntryPoint": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Microsoft.DotNet.Watcher.Core": "1.0.0-*", - "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", - "Microsoft.Extensions.Logging": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" - }, - "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8" - } + "version": "1.0.0-*", + "compilationOptions": { + "warningsAsErrors": true, + "emitEntryPoint": true, + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "Microsoft.DotNet.Watcher.Core": "1.0.0-*", + "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", + "Microsoft.Extensions.Logging": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*", + "Microsoft.NETCore.Platforms": "1.0.1-*" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } -} + } +} \ No newline at end of file