mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source 
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/DebTargets.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	scripts/package/package-debian.sh
	src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
	src/dotnet/commands/dotnet-new/Program.cs
	src/dotnet/commands/dotnet-pack/PackageGenerator.cs
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
This commit is contained in:
Piotr Puszkiewicz 2016-08-16 18:30:52 -07:00
commit 2db1997bc0
450 changed files with 7134 additions and 18741 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/dotnet/Program.cs
View file

@ -9,8 +9,7 @@ using System.Runtime.Loader;
using System.Text;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Configurer;
using Microsoft.DotNet.InternalAbstractions;
using Microsoft.DotNet.ProjectModel.Server;
using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.Tools.Build;
using Microsoft.DotNet.Tools.Compiler;
using Microsoft.DotNet.Tools.Compiler.Csc;
@ -19,6 +18,7 @@ using Microsoft.DotNet.Tools.New;
using Microsoft.DotNet.Tools.NuGet;
using Microsoft.DotNet.Tools.Publish;
using Microsoft.DotNet.Tools.Restore;
using Microsoft.DotNet.Tools.Restore3;
using Microsoft.DotNet.Tools.Run;
using Microsoft.DotNet.Tools.Test;
using NuGet.Frameworks;
@ -35,11 +35,13 @@ namespace Microsoft.DotNet.Cli
["new"] = NewCommand.Run,
["nuget"] = NuGetCommand.Run,
["pack"] = PackCommand.Run,
["projectmodel-server"] = ProjectModelServerCommand.Run,
["publish"] = PublishCommand.Run,
["restore"] = RestoreCommand.Run,
["run"] = RunCommand.Run,
["test"] = TestCommand.Run
["test"] = TestCommand.Run,
["build3"] = Build3Command.Run,
["run3"] = Run3Command.Run,
["restore3"] = Restore3Command.Run,
};
public static int Main(string[] args)