From 3b0260056669fbc005a68a930bf8f1bac638c4db Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Tue, 22 Mar 2016 09:38:50 -0700 Subject: [PATCH] Revert "Reacting to CoreCLR package changes" This reverts commit 1d91b7bb0d9e0044b23e0e1a2e6a1b598bd16aca. --- samples/IISSample/project.json | 4 ++-- .../project.json | 1 + src/dotnet-publish-iis/project.json | 1 + .../project.json | 2 +- .../project.json | 2 +- test/TestSites/project.json | 2 +- test/dotnet-publish-iis.Tests/project.json | 7 ++----- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json index 1141de3a07..416c330ce0 100644 --- a/samples/IISSample/project.json +++ b/samples/IISSample/project.json @@ -13,8 +13,8 @@ "web": "IISSample" }, "frameworks": { - "net451": { }, - "netstandardapp1.5": { } + "dnx451": { }, + "dnxcore50": { } }, "publishExclude": [ "node_modules", diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json index 2e9667d2f5..9087a880cd 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json +++ b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json @@ -10,6 +10,7 @@ }, "dependencies": { + "NETStandard.Library": "1.0.0-*", "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", "Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/src/dotnet-publish-iis/project.json b/src/dotnet-publish-iis/project.json index b6b23ae111..8c70943541 100644 --- a/src/dotnet-publish-iis/project.json +++ b/src/dotnet-publish-iis/project.json @@ -10,6 +10,7 @@ }, "dependencies": { + "NETStandard.Library": "1.0.0-*", "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", "Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json index 6c69336f4a..da6782f459 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json @@ -7,7 +7,7 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "dnxcore50": { "imports": "portable-net451+win8", "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json index 6fb6f6f983..8a969aebbf 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json @@ -5,7 +5,7 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "netstandardapp1.5": { + "dnxcore50": { "imports": "portable-net451+win8", "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/TestSites/project.json b/test/TestSites/project.json index 0439a35a03..8cafbbc3cd 100644 --- a/test/TestSites/project.json +++ b/test/TestSites/project.json @@ -17,7 +17,7 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "dnxcore50": { "imports": "portable-net451+win8", "dependencies": { "System.Net.Primitives": "4.0.11-*", diff --git a/test/dotnet-publish-iis.Tests/project.json b/test/dotnet-publish-iis.Tests/project.json index 1e7d9ed5e8..4a3f14c43f 100644 --- a/test/dotnet-publish-iis.Tests/project.json +++ b/test/dotnet-publish-iis.Tests/project.json @@ -5,11 +5,8 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "netstandardapp1.5": { - "imports": [ - "portable-net451+win8", - "dnxcore50" - ], + "dnxcore50": { + "imports": "portable-net451+win8", "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" }