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:55:45 -07:00
parent 48b436ec8a 0b393fbc04
commit 53327df4fc
20 changed files with 140 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/DatabaseErrorPageSample/project.json
View File

@ -11,7 +11,7 @@
"type": "build"
}
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -29,9 +29,11 @@
}
}
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

10
samples/DeveloperExceptionPageSample/project.json
View File

@ -5,7 +5,7 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -22,9 +22,11 @@
}
}
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

10
samples/ElmPageSample/project.json
View File

@ -5,7 +5,7 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -22,9 +22,11 @@
}
}
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

12
samples/ExceptionHandlerSample/project.json
View File

@ -6,7 +6,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -23,10 +23,12 @@
}
}
},
"content": [
"wwwroot",
"web.config"
],
"publishOptions": {
"include": [
"wwwroot",
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

10
samples/MiddlewareAnalysisSample/project.json
View File

@ -8,7 +8,7 @@
"Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -25,9 +25,11 @@
}
}
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

10
samples/RuntimeInfoPageSample/project.json
View File

@ -5,7 +5,7 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -22,9 +22,11 @@
}
}
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

10
samples/StatusCodePagesSample/project.json
View File

@ -1,5 +1,5 @@
{
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"dependencies": {
@ -22,9 +22,11 @@
}
}
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

10
samples/WelcomePageSample/project.json
View File

@ -5,7 +5,7 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -22,9 +22,11 @@
}
}
},
"content": [
"web.config"
],
"publishOptions": {
"include": [
"web.config"
]
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

18
src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
View File

@ -1,15 +1,17 @@
{
"version": "1.0.0-*",
"description": "ASP.NET Core diagnostics middleware abstractions and feature interface definitions.",
"tags": [
"aspnetcore",
"diagnostics"
],
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
},
"tags": [
"aspnetcore",
"diagnostics"
]
},
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [

18
src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
View File

@ -1,11 +1,7 @@
{
"version": "0.1.0-*",
"description": "ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs.",
"tags": [
"aspnetcore",
"diagnostics"
],
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [
@ -13,9 +9,15 @@
],
"xmlDoc": true
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
},
"tags": [
"aspnetcore",
"diagnostics"
]
},
"dependencies": {
"Microsoft.AspNetCore.DiagnosticsViewPage.Sources": {

20
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
View File

@ -1,16 +1,18 @@
{
"version": "1.0.0-*",
"description": "ASP.NET Core middleware for Entity Framework Core error pages. Use this middleware to detect and diagnose errors with Entity Framework Core migrations.",
"tags": [
"aspnetcore",
"diagnostics",
"entityframeworkcore"
],
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
},
"tags": [
"aspnetcore",
"diagnostics",
"entityframeworkcore"
]
},
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [

34
src/Microsoft.AspNetCore.Diagnostics/project.json
View File

@ -1,21 +1,30 @@
{
"version": "1.0.0-*",
"description": "ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware",
"tags": [
"aspnetcore",
"diagnostics"
],
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [
"CS1591"
],
"xmlDoc": true
"xmlDoc": true,
"compile": {
"exclude": [
"DeveloperExceptionPage/Views/*.cshtml",
"RuntimeInfo/Views/*.cshtml",
"WelcomePage/Views/*.cshtml"
]
}
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
},
"tags": [
"aspnetcore",
"diagnostics"
]
},
"dependencies": {
"Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0-*",
@ -39,10 +48,5 @@
"System.Reflection.Extensions": "4.0.1-*"
}
}
},
"compileExclude": [
"DeveloperExceptionPage/Views/*.cshtml",
"RuntimeInfo/Views/*.cshtml",
"WelcomePage/Views/*.cshtml"
]
}
}

2
src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json
View File

@ -5,4 +5,4 @@
"frameworks": {
"netstandard1.0": {}
}
}
}

18
src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
View File

@ -1,11 +1,7 @@
{
"version": "1.0.0-*",
"description": "ASP.NET Core middleware for analyzing middleware in the request pipeline with System.Diagnostics.DiagnosticSource.",
"tags": [
"aspnetcore",
"diagnostics"
],
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [
@ -13,9 +9,15 @@
],
"xmlDoc": true
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
},
"tags": [
"aspnetcore",
"diagnostics"
]
},
"dependencies": {
"Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*",

10
src/PageGenerator/project.json
View File

@ -1,14 +1,16 @@
{
"version": "1.0.0-*",
"description": "Builds the pages for the Diagnostics projects. Runs in build.cmd.",
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"emitEntryPoint": true,
"keyFile": "../../tools/Key.snk"
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"
}
},
"dependencies": {
"Microsoft.AspNetCore.Razor": "1.0.0-*"

6
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
View File

@ -1,5 +1,6 @@
{
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*",
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-*",
@ -15,8 +16,7 @@
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-*"
}
},
"imports": [
"dnxcore50",
@ -33,7 +33,7 @@
}
}
},
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true
}
}

4
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
View File

@ -1,8 +1,9 @@
{
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.EntityFrameworkCore.InMemory": "1.0.0-*",
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-*",
@ -22,7 +23,6 @@
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
},
"imports": [

4
test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
View File

@ -1,5 +1,6 @@
{
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"DatabaseErrorPageSample": "1.0.0",
"DeveloperExceptionPageSample": "1.0.0",
@ -29,8 +30,7 @@
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-*"
}
}
},
"net451": {

24
test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
View File

@ -1,9 +1,20 @@
{
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
"keyFile": "../../tools/Key.snk",
"embed": {
"include": [
"Resources/**"
]
},
"copyToOutput": {
"include": [
"TestFiles/**/*"
]
}
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Diagnostics.Elm": "0.1.0-*",
@ -22,7 +33,6 @@
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
},
"imports": [
@ -41,11 +51,5 @@
}
}
},
"testRunner": "xunit",
"content": [
"TestFiles/**/*"
],
"resource": [
"Resources/**"
]
"testRunner": "xunit"
}

6
test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
View File

@ -1,8 +1,9 @@
{
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": false
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.MiddlewareAnalysis": "1.0.0-*",
@ -18,8 +19,7 @@
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-*"
}
},
"imports": [
"dnxcore50",