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:48 -07:00
parent 41a3fa2329 63a9d64394
commit dc68e3b021
8 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.DotNet.Watcher.Core/project.json
View File

@ -1,9 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {

6
src/Microsoft.DotNet.Watcher.Tools/project.json
View File

@ -1,11 +1,13 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"outputName": "dotnet-watch", "outputName": "dotnet-watch",
"warningsAsErrors": true, "warningsAsErrors": true,
"emitEntryPoint": true, "emitEntryPoint": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {

2
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
View File

@ -1,5 +1,5 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },

2
test/Microsoft.DotNet.Watcher.Tools.Tests/project.json
View File

@ -1,5 +1,5 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },

4
test/TestApps/AppWithDeps/project.json
View File

@ -1,13 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"Dependency": "1.0.0" "Dependency": "1.0.0"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"dependencies": { "dependencies": {

2
test/TestApps/Dependency/project.json
View File

@ -1,10 +1,8 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-*" "NETStandard.Library": "1.5.0-*"
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.5": {
"imports": [ "imports": [

3
test/TestApps/GlobbingApp/project.json
View File

@ -1,6 +1,6 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"compile": [ "compile": [
@ -10,7 +10,6 @@
"exclude": [ "exclude": [
"exclude/*" "exclude/*"
], ],
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"dependencies": { "dependencies": {

3
test/TestApps/NoDepsApp/project.json
View File

@ -1,9 +1,8 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"dependencies": { "dependencies": {