Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'

Conflicts:
	src/dotnet/Program.cs
This commit is contained in:
Piotr Puszkiewicz 2016-08-18 18:08:45 -07:00
commit 578adf072c
81 changed files with 625 additions and 286 deletions

View file

@ -15,7 +15,7 @@ using Microsoft.DotNet.Tools.Compiler;
using Microsoft.DotNet.Tools.Compiler.Csc;
using Microsoft.DotNet.Tools.Help;
using Microsoft.DotNet.Tools.New;
using Microsoft.DotNet.Tools.NuGet;
using Microsoft.DotNet.Tools.Pack3;
using Microsoft.DotNet.Tools.Publish;
using Microsoft.DotNet.Tools.Restore;
using Microsoft.DotNet.Tools.Restore3;
@ -42,6 +42,7 @@ namespace Microsoft.DotNet.Cli
["build3"] = Build3Command.Run,
["run3"] = Run3Command.Run,
["restore3"] = Restore3Command.Run,
["pack3"] = Pack3Command.Run,
};
public static int Main(string[] args)