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

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-05-02 14:56:24 -07:00
parent 7ac6ea9caf 2205f33a59
commit bb043458af
8 changed files with 80 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
samples/IISSample/project.json
View File

@ -5,11 +5,11 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
"net451": { },
"net451": {},
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
@ -20,7 +20,9 @@
"imports": "dnxcore50"
}
},
"content": [
"web.config"
]
}
"publishOptions": {
"include": [
"web.config"
]
}
}

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

@ -1,14 +1,15 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true,
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true,
"outputName": "dotnet-publish-iis"
},
"dependencies": {
"Microsoft.Extensions.CommandLineUtils": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
@ -27,4 +28,4 @@
}
}
}
}
}

14
src/Microsoft.AspNetCore.Server.IISIntegration/project.json
View File

@ -1,15 +1,19 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"description": "ASP.NET Core components for working with the IIS AspNetCoreModule.",
"repository": {
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/IISIntegration"
}
},
"dependencies": {
"Microsoft.AspNetCore.Hosting": "1.0.0-*",
@ -24,7 +28,7 @@
}
},
"frameworks": {
"net451": { },
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.Security.Principal.Windows": "4.0.0-*"
@ -35,4 +39,4 @@
]
}
}
}
}

62
test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json
View File

@ -1,31 +1,33 @@
{
"content": [
"Http.config",
"Https.config",
"NtlmAuthentation.config"
],
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
"Microsoft.Extensions.Logging": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"xunit": "2.1.0"
},
"frameworks": {
"net451": {
"dependencies": {
"xunit.runner.console": "2.1.0"
},
"frameworkAssemblies": {
"System.Data": "",
"System.Net.Http": "",
"System.Net.Http.WebRequest": "",
"System.Runtime": "",
"System.Xml": ""
}
}
},
"testRunner": "xunit"
}
"publishOptions": {
"include": [
"Http.config",
"Https.config",
"NtlmAuthentation.config"
]
},
"buildOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
"Microsoft.Extensions.Logging": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"xunit": "2.1.0"
},
"frameworks": {
"net451": {
"dependencies": {
"xunit.runner.console": "2.1.0"
},
"frameworkAssemblies": {
"System.Data": "",
"System.Net.Http": "",
"System.Net.Http.WebRequest": "",
"System.Runtime": "",
"System.Xml": ""
}
}
},
"testRunner": "xunit"
}

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

@ -1,6 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*",
"xunit": "2.1.0"
@ -16,7 +17,6 @@
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*"
}
},

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

@ -1,5 +1,6 @@
{
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"xunit": "2.1.0",
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
},
@ -11,7 +12,6 @@
"portable-net45+win8"
],
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*",
"Microsoft.NETCore.App": {
"type": "platform",
@ -21,4 +21,4 @@
}
},
"testRunner": "xunit"
}
}

14
test/TestSites.Portable/project.json
View File

@ -1,14 +1,16 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"compile": [
"../TestSites/Startup*.cs"
],
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@ -34,4 +36,4 @@
}
}
}
}
}

26
test/TestSites/project.json
View File

@ -1,11 +1,13 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@ -28,14 +30,14 @@
"System.Diagnostics.Process": "4.1.0-*"
}
},
"net451": { }
"net451": {}
},
"runtimes": {
"win7-x64": { },
"win7-x86": { },
"osx.10.10-x64": { },
"osx.10.11-x64": { },
"ubuntu.14.04-x64": { },
"ubuntu.15.04-x64": { }
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"ubuntu.15.04-x64": {}
}
}
}