Merging with upstream changes

Author: markcowl

.gitignore

@@ -19,6 +19,8 @@ app.config
 *.suo
 *.user
 *.sln.docstates
+*.lock.json
+.vs/
 
 # Build results
 [Dd]ebug/

src/CLU/CLUCoreCLR.sln

@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24711.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.WindowsAzure.Commands.Common", "Microsoft.WindowsAzure.Commands.Common\Microsoft.WindowsAzure.Commands.Common.xproj", "{5F567ACA-595E-436D-83DB-A21E08F82DF6}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Commands.Common", "Commands.Common\Commands.Common.xproj", "{5F567ACA-595E-436D-83DB-A21E08F82DF6}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Commands.Common.Authentication", "Commands.Common.Authentication\Commands.Common.Authentication.xproj", "{4CE82310-D016-497D-93A0-0323A3E62064}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Common.Resources", "Microsoft.Azure.Commands.Common.Resources\Microsoft.Azure.Commands.Common.Resources.xproj", "{447889D2-370A-461B-ADA3-E892C22E2C05}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Commands.Common.Resources", "Commands.Common.Resources\Commands.Common.Resources.xproj", "{447889D2-370A-461B-ADA3-E892C22E2C05}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Profile", "Microsoft.Azure.Commands.Profile\Microsoft.Azure.Commands.Profile.xproj", "{45B05B68-516F-4D74-897F-56D12894946C}"
 EndProject

src/CLU/Commands.Common.Authentication/Commands.Common.Authentication.xproj

@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>4ce82310-d016-497d-93a0-0323a3e62064</ProjectGuid>
-    <RootNamespace>Commands.Common.Authentication</RootNamespace>
+    <RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

src/CLU/Commands.Common.Authentication/Models/AzureContext.cs

@@ -14,6 +14,7 @@
 
 using Newtonsoft.Json;
 using System;
+
 namespace Microsoft.Azure.Common.Authentication.Models
 {
     /// <summary>

src/CLU/Commands.Common.Authentication/Properties/launchSettings.json

@@ -0,0 +1,3 @@
+{
+  "profiles": {}
+}