huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into dev

This commit is contained in:
moozzyk 2016-04-07 15:17:55 -07:00
parent a6b08c75e0 e5d651fc30
commit b30cf982d1
6 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
samples/IISSample/project.json
View File

@ -3,8 +3,7 @@
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*"
"Microsoft.NETCore.Platforms": "1.0.1-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

1
src/Microsoft.AspNetCore.Server.IISIntegration.Tools/PublishIISCommand.cs
View File

@ -7,7 +7,6 @@ using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.ProjectModel; using Microsoft.DotNet.ProjectModel;
using Microsoft.Extensions.Configuration;
namespace Microsoft.AspNetCore.Server.IISIntegration.Tools namespace Microsoft.AspNetCore.Server.IISIntegration.Tools
{ {

12
src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json
View File

@ -11,19 +11,23 @@
"dependencies": { "dependencies": {
"Microsoft.Extensions.CommandLineUtils": "1.0.0-*", "Microsoft.Extensions.CommandLineUtils": "1.0.0-*",
"Microsoft.Extensions.Configuration.Json": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"portable-net451+win8", "portable-net451+win8",
"dnxcore50" "dnxcore50"
] ],
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-*"
}
}
} }
} }
} }

13
src/dotnet-publish-iis/project.json
View File

@ -14,12 +14,21 @@
"Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netcoreapp1.0": {
"imports": [
"portable-net451+win8",
"dnxcore50"
],
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-*"
}
}
} }
} }
} }

12
test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json
View File

@ -4,15 +4,19 @@
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"portable-net451+win8", "portable-net451+win8",
"dnxcore50" "dnxcore50",
"netstandardapp1.5"
], ],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*", "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-*"
}
} }
} }
}, },

12
test/dotnet-publish-iis.Tests/project.json
View File

@ -2,17 +2,21 @@
"dependencies": { "dependencies": {
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-publish-iis": "1.0.0-*", "dotnet-publish-iis": "1.0.0-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"portable-net451+win8", "portable-net451+win8",
"dnxcore50" "dnxcore50",
"netstandardapp1.5"
], ],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-*"
}
} }
} }
}, },