Merge branch 'rel/1.0.0-msbuild1-update1' into feature/msbuild

This commit is contained in:
Nate McMaster 2016-11-16 15:33:50 -08:00
commit 15a877e7fb
2 changed files with 2 additions and 2 deletions

View File

@ -25,6 +25,6 @@
<file src="dotnet-watch.dll" target="lib\netcoreapp1.0\" /> <file src="dotnet-watch.dll" target="lib\netcoreapp1.0\" />
<file src="dotnet-watch.deps.json" target="lib\netcoreapp1.0\" /> <file src="dotnet-watch.deps.json" target="lib\netcoreapp1.0\" />
<file src="dotnet-watch.runtimeconfig.json" target="lib\netcoreapp1.0\" /> <file src="dotnet-watch.runtimeconfig.json" target="lib\netcoreapp1.0\" />
<file src="tools/*.targets" target="tools\" /> <file src="tools\*.targets" target="tools\" />
</files> </files>
</package> </package>

View File

@ -32,7 +32,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-preview3-004050", "Microsoft.DotNet.Cli.Utils": "1.0.0-preview3-004056",
"Microsoft.Extensions.Logging": "1.0.0", "Microsoft.Extensions.Logging": "1.0.0",
"Microsoft.Extensions.Logging.Console": "1.0.0", "Microsoft.Extensions.Logging.Console": "1.0.0",
"Microsoft.Extensions.Process.Sources": { "Microsoft.Extensions.Process.Sources": {