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

Conflicts:
	setup/azurecmdfiles.wxi

Author: huangpf

setup/azurecmdfiles.wxi

@@ -5097,6 +5097,27 @@
             <ComponentRef Id="cmpE2870DA9D9EABA49600629B6564747C7" />
             <ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
             <ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
+            <ComponentRef Id="cmp26757C9254980E46634DDBF7FA3DC0EE" />
+            <ComponentRef Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" />
+            <ComponentRef Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" />
+            <ComponentRef Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" />
+            <ComponentRef Id="cmpC329903507D2C760A07068087F01E0F0" />
+            <ComponentRef Id="cmpA98F34A253A4D33476481745DC338B72" />
+            <ComponentRef Id="cmp3218E7B28F820C614786457C75F68FDE" />
+            <ComponentRef Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" />
+            <ComponentRef Id="cmp9D7D5FC99E7FB18787B78A246F386511" />
+            <ComponentRef Id="cmp01D375B8D50C7BB0584789AF3262E6EB" />
+            <ComponentRef Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" />
+            <ComponentRef Id="cmp71E32FD24E0F5940BB92662C539A00BA" />
+            <ComponentRef Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" />
+            <ComponentRef Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" />
+            <ComponentRef Id="cmpFF465588FB32BEF908242C7BC2621DF6" />
+            <ComponentRef Id="cmpDEF412B27E738D9D17F5B36668F8D91C" />
+            <ComponentRef Id="cmp28E39E96F170CA278BC16412EA44C66B" />
+            <ComponentRef Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" />
+            <ComponentRef Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" />
+            <ComponentRef Id="cmp5A44264503BFAF83A7DA76A44878BC02" />
+            <ComponentRef Id="cmp3C91684B2D48E072C9B84111E717AC26" />
             <ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
             <ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
             <ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />

src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

@@ -161,7 +161,7 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
             NetworkManagementClient = this.GetNetworkManagementClientClient(context);
             ComputeManagementClient = GetComputeManagementClient();
             AuthorizationManagementClient = GetAuthorizationManagementClient();
-            GraphClient = GetGraphClient();
+            // GraphClient = GetGraphClient();
 
             helper.SetupManagementClients(
                 ResourceManagementClient,
@@ -171,8 +171,8 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
                 //eventsClient,
                 NetworkManagementClient,
                 ComputeManagementClient,
-                AuthorizationManagementClient,
-                GraphClient);
+                AuthorizationManagementClient);
+                // GraphClient);
         }
 
         private GraphRbacManagementClient GetGraphClient()

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PIRTest.cs

@@ -342,12 +342,12 @@ public void AzurePlatformVMImageScenarioTest()
 
         private void SwitchToPublisher()
         {
-            vmPowershellCmdlets.SetDefaultAzureSubscription(publisher);
+            vmPowershellCmdlets.SetDefaultAzureSubscription(publisherSubId);
         }
 
         private void SwitchToNormalUser()
         {
-            vmPowershellCmdlets.SetDefaultAzureSubscription(normaluser);
+            vmPowershellCmdlets.SetDefaultAzureSubscription(normaluserSubId);
         }
 
         private void WaitForReplicationComplete(string imageName)

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs

@@ -341,7 +341,7 @@ protected static void ReImportSubscription()
         {
             // Re-import the subscription.
             vmPowershellCmdlets.ImportAzurePublishSettingsFile();
-            vmPowershellCmdlets.SetDefaultAzureSubscription(CredentialHelper.DefaultSubscriptionName);
+            vmPowershellCmdlets.SetDefaultAzureSubscription(defaultAzureSubscription.SubscriptionId);
             vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionId, defaultAzureSubscription.CurrentStorageAccountName);
         }