Rebase Conflicts

This commit is contained in:
PiotrP 2016-04-25 11:29:29 -07:00
parent 91bfc022a2
commit 44f6642116
7 changed files with 17 additions and 141 deletions

View file

@ -42,9 +42,9 @@ namespace Microsoft.DotNet.Cli
public static int Main(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);
new MulticoreJitActivator().TryActivateMulticoreJit();
if (Env.GetEnvironmentVariableAsBool("DOTNET_CLI_CAPTURE_TIMING", false))
{
PerfTrace.Enabled = true;