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

merge master

Browse source
This commit is contained in:
jonsequitur 2017-03-19 17:09:05 -07:00
parent 3ce1b9f0b7
commit c85492bd48
21 changed files with 412 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/dotnet/Program.cs
View file

@ -34,6 +34,7 @@ namespace Microsoft.DotNet.Cli
{
public class Program
{
private static Dictionary<string, Func<string[], int>> s_builtIns = new Dictionary<string, Func<string[], int>>
{
["add"] = AddCommand.Run,
@ -58,6 +59,7 @@ namespace Microsoft.DotNet.Cli
["parse"] = ParseCommand.Run
};
public static int Main(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);
@ -188,10 +190,10 @@ namespace Microsoft.DotNet.Cli
telemetryClient.TrackEvent(command, null, null);
int exitCode;
Func<string[], int> builtIn;
if (s_builtIns.TryGetValue(command, out builtIn))
BuiltInCommandMetadata builtIn;
if (BuiltInCommandsCatalog.Commands.TryGetValue(command, out builtIn))
{
exitCode = builtIn(appArgs.ToArray());
exitCode = builtIn.Command(appArgs.ToArray());
}
else
{
@ -234,9 +236,9 @@ namespace Microsoft.DotNet.Cli
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
}
internal static bool TryGetBuiltInCommand(string commandName, out Func<string[], int> builtInCommand)
internal static bool TryGetBuiltInCommand(string commandName, out BuiltInCommandMetadata builtInCommand)
{
return s_builtIns.TryGetValue(commandName, out builtInCommand);
return BuiltInCommandsCatalog.Commands.TryGetValue(commandName, out builtInCommand);
}
private static void PrintVersion()