Merge branch 'dev' of github.com:Azure/azure-powershell into dev

Conflicts:
	src/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
	src/Common/Commands.ResourceManager.Common/Properties/Resources.Designer.cs
	src/Common/Commands.ResourceManager.Common/Properties/Resources.resx
	src/ResourceManager.sln

Author: Jianghao Lu

src/Common/Commands.Common/ProfileClient.cs

@@ -32,7 +32,7 @@ namespace Microsoft.Azure.Common.Authentication
     /// </summary>
     public class ProfileClient
     {
-        public AzureRMProfile Profile { get; private set; }
+        public AzureSMProfile Profile { get; private set; }
 
         public Action<string> WarningLog;
 
@@ -129,12 +129,12 @@ private void UpgradeProfile()
                 // In case that we changed a disk profile, reload it
                 if (Profile != null && Profile.ProfilePath == newProfileFilePath)
                 {
-                    Profile = new AzureRMProfile(Profile.ProfilePath);
+                    Profile = new AzureSMProfile(Profile.ProfilePath);
                 }
             }
         }
 
-        public ProfileClient(AzureRMProfile profile)
+        public ProfileClient(AzureSMProfile profile)
         {
             Profile = profile;
             WarningLog = (s) => Debug.WriteLine(s);
@@ -330,16 +330,16 @@ public AzureAccount AddAccountAndLoadSubscriptions(AzureAccount account, AzureEn
                     AddOrSetSubscription(subscription);
                 }
 
-                if (Profile.DefaultContext.Subscription == null)
+                if (Profile.DefaultSubscription == null)
                 {
-                    var firstSubscription = Profile.DefaultContext.Subscription.Values.FirstOrDefault();
+                    var firstSubscription = Profile.Subscriptions.Values.FirstOrDefault();
                     if (firstSubscription != null)
                     {
                         SetSubscriptionAsDefault(firstSubscription.Name, firstSubscription.Account);
                     }
                 }
 
-                return Profile.DefaultContext.Account;
+                return Profile.Accounts[account.Id];
             }
             else
             {

src/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -117,21 +117,21 @@ protected override void PromptForDataCollectionProfileIfNotExists()
 
         protected override void InitializeQosEvent()
         {
-            QosEvent = new AzurePSQoSEvent()
-            {
-                CmdletType = this.GetType().Name,
-                IsSuccess = true,
-            };
-
-            if (this.DefaultContext != null && this.DefaultContext.Subscription != null)
-            {
-                QosEvent.Uid = MetricHelper.GenerateSha256HashString(
-                    this.DefaultContext.Subscription.Id.ToString());
-            }
-            else
-            {
-                QosEvent.Uid = "defaultid";
-            }
+            //QosEvent = new AzurePSQoSEvent()
+            //{
+            //    CmdletType = this.GetType().Name,
+            //    IsSuccess = true,
+            //};
+
+            //if (this.DefaultContext != null && this.DefaultContext.Subscription != null)
+            //{
+            //    QosEvent.Uid = MetricHelper.GenerateSha256HashString(
+            //        this.DefaultContext.Subscription.Id.ToString());
+            //}
+            //else
+            //{
+            //    QosEvent.Uid = "defaultid";
+            //}
         }
     }
 }

src/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj

@@ -167,40 +167,38 @@
     <Compile Include="..\Commands.Common\PowerShellUtilities.cs">
       <Link>Common\PowerShellUtilities.cs</Link>
     </Compile>
-    <Compile Include="..\Commands.Common\ProfileClient.cs">
-      <Link>Common\ProfileClient.cs</Link>
-    </Compile>
     <Compile Include="..\Commands.Common\ProfileClientExtensions.cs">
       <Link>Common\ProfileClientExtensions.cs</Link>
     </Compile>
     <Compile Include="..\Commands.Common\PSAzureAccount.cs">
       <Link>Common\PSAzureAccount.cs</Link>
     </Compile>
-    <Compile Include="..\Commands.Common\PublishSettingsImporter.cs">
-      <Link>Common\PublishSettingsImporter.cs</Link>
-    </Compile>
     <Compile Include="..\Commands.Common\RecordingTracingInterceptor.cs">
       <Link>Common\RecordingTracingInterceptor.cs</Link>
     </Compile>
     <Compile Include="..\Commands.Common\SecureStringExtensions.cs">
       <Link>Common\SecureStringExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\Commands.Common\TestMockSupport.cs">
+      <Link>Common\TestMockSupport.cs</Link>
+    </Compile>
     <Compile Include="AzureRMCmdlet.cs" />
-    <Compile Include="Common\TestMockSupport.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="RMProfileClient.cs" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/Common/Commands.ResourceManager.Common/Common/TestMockSupport.cs

@@ -148,4 +148,7 @@ Select Y to enable data collection [Y/N]:</value>
   <data name="InvalidDefaultSubscription" xml:space="preserve">
     <value>No default subscription has been designated. Use Select-AzureSubscription -Default &lt;subscriptionName&gt; to set the default subscription.</value>
   </data>
+  <data name="TenantNotFound" xml:space="preserve">
+    <value>Tenant '{0}' was not found. Please verify that your account has access to this tenant.</value>
+  </data>
 </root>