Merge branch 'release' into dev

This commit is contained in:
Cesar Blum Silveira 2015-11-04 10:49:27 -08:00
commit 4ced3c51ef
8 changed files with 20 additions and 5 deletions

View File

@ -6,7 +6,8 @@
"url": "git://github.com/aspnet/diagnostics"
},
"compilationOptions": {
"warningsAsErrors": true
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"frameworks": {
"net451": {},

View File

@ -1,6 +1,10 @@
{
"version": "1.0.0-*",
"description": "ASP.NET 5 Middleware to capture and display the request logs.",
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"

View File

@ -6,7 +6,8 @@
"url": "git://github.com/aspnet/diagnostics"
},
"compilationOptions": {
"warningsAsErrors": true
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*",

View File

@ -5,7 +5,7 @@ using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNet.Diagnostics.Tests")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: InternalsVisibleTo("Microsoft.AspNet.Diagnostics.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: NeutralResourcesLanguage("en-US")]

View File

@ -1,6 +1,10 @@
{
"version": "1.0.0-*",
"description": "ASP.NET 5 Middleware for exception handling, exception display pages, and diagnostics information.",
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"

View File

@ -1,6 +1,10 @@
{
"version": "1.0.0-*",
"description": "Builds the pages for the Diagnostics projects. Runs in build.cmd.",
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/diagnostics"

View File

@ -1,6 +1,7 @@
{
"compilationOptions": {
"warningsAsErrors": false
"warningsAsErrors": false,
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*",

BIN
tools/Key.snk Normal file

Binary file not shown.