From e5d651fc30be79295114ca6082f65c9030f942ae Mon Sep 17 00:00:00 2001 From: moozzyk Date: Fri, 25 Mar 2016 12:40:15 -0700 Subject: [PATCH] Updating publish-iis to be a portable app --- samples/IISSample/project.json | 3 +-- .../PublishIISCommand.cs | 1 - .../project.json | 12 ++++++++---- src/dotnet-publish-iis/project.json | 13 +++++++++++-- .../project.json | 12 ++++++++---- test/dotnet-publish-iis.Tests/project.json | 12 ++++++++---- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json index 80f8b836a6..7056b2b56a 100644 --- a/samples/IISSample/project.json +++ b/samples/IISSample/project.json @@ -3,8 +3,7 @@ "dependencies": { "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/PublishIISCommand.cs b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/PublishIISCommand.cs index a07b870d3b..4b24eb5783 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/PublishIISCommand.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/PublishIISCommand.cs @@ -7,7 +7,6 @@ using System.Xml; using System.Xml.Linq; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ProjectModel; -using Microsoft.Extensions.Configuration; namespace Microsoft.AspNetCore.Server.IISIntegration.Tools { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json index cc34644dfa..386d2cba1c 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json +++ b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json @@ -11,19 +11,23 @@ "dependencies": { "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", - "Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "portable-net451+win8", "dnxcore50" - ] + ], + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-*" + } + } } } } diff --git a/src/dotnet-publish-iis/project.json b/src/dotnet-publish-iis/project.json index f25d566fa9..a57737ff80 100644 --- a/src/dotnet-publish-iis/project.json +++ b/src/dotnet-publish-iis/project.json @@ -14,12 +14,21 @@ "Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { + "imports": [ + "portable-net451+win8", + "dnxcore50" + ], + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-*" + } + } } } } diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json index be3b3ca7e1..0ff2ab16e8 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json @@ -4,15 +4,19 @@ "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "portable-net451+win8", - "dnxcore50" + "dnxcore50", + "netstandardapp1.5" ], "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", - "System.Diagnostics.Process": "4.1.0-*" + "System.Diagnostics.Process": "4.1.0-*", + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-*" + } } } }, diff --git a/test/dotnet-publish-iis.Tests/project.json b/test/dotnet-publish-iis.Tests/project.json index 45e180d854..96b4324560 100644 --- a/test/dotnet-publish-iis.Tests/project.json +++ b/test/dotnet-publish-iis.Tests/project.json @@ -2,17 +2,21 @@ "dependencies": { "xunit": "2.1.0", "dotnet-publish-iis": "1.0.0-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "portable-net451+win8", - "dnxcore50" + "dnxcore50", + "netstandardapp1.5" ], "dependencies": { - "dotnet-test-xunit": "1.0.0-dev-*" + "dotnet-test-xunit": "1.0.0-dev-*", + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-*" + } } } },