Merge branch 'preview' of https://github.com/Azure/azure-powershell into EHFixes

# Conflicts:
#	tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv

Author: Ajit Navasare (MINDTREE LIMITED)

AzurePowershell.Test.targets

@@ -77,6 +77,7 @@
 			<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\ContainerRegistry\Commands.ContainerRegistry.Test\bin\Debug\Microsoft.Azure.Commands.ContainerRegistry.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
+			<XUnitTests Include=".\src\ResourceManager\Consumption\Commands.Consumption.Test\bin\Debug\Microsoft.Azure.Commands.Consumption.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLake.Test.dll"/>
@@ -109,6 +110,7 @@
 			<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\ServiceBus\Commands.ServiceBus.Test\bin\Debug\Microsoft.Azure.Commands.ServiceBus.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\EventHub\Commands.EventHub.Test\bin\Debug\Microsoft.Azure.Commands.EventHubs.Test.dll"/>
+			<XUnitTests Include=".\src\ResourceManager\Relay\Commands.Relay.Test\bin\Debug\Microsoft.Azure.Commands.Relay.Test.dll"/>
 			<XUnitTests Include="@(AsmXUnitTests)"/>
 		</ItemGroup>
 		<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">

documentation/Using-Azure-TestFramework.md

@@ -10,17 +10,18 @@
 4. Record/Playback tests
 5. Change Test Environment settings at run-time
 6. Troubleshooting
-7. Environment Variable Reference
+7. Supported Key=Value pairs in ConnectionString
+8. Environment Variable Reference
 
 ## 1. Getting Started
-1. Launch .\tools\PS-VSPrompt shortcut
+1. Double click .\tools\PS-VSPrompt shortcut
 	1. This starts VS Dev command prompt in PowerShell
 2. Import module that helps in performing basic repository tasks
 	1. Import-Module Repo-Tasks.psd1
-	2. Type Get-Command -Module Repo-Tasks to see list of cmdlets
+	2. Type Get-Commands -Module Repo-Tasks to see list of cmdlets
 	3. Get-Help <CommandName> to get help on individual commands.
 
-## 2. Acquiring TestFramework
+## 2. Accquring TestFramework
 
 TestFramework is available on NuGet at https://www.nuget.org/packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework/ .
 
@@ -105,17 +106,21 @@ Changing the above properties at run-time has the potential to hard code few thi
 
 Ensure that the `HttpRecorderMode` in the `TEST_CSM_ORGID_AUTHENTICATION` environment variable is consistent with the value in `AZURE_TEST_MODE` environment variable.
 
-## 7. Environment Variable Reference
+##7. Connection string
+Connection string is provided to Test Framework using following environment variables.
+In order to debug test set the following environment variables before starting Visual Studio:
 
-#### 7.1.  Supported Keys in connection string
+	TEST_CSM_ORGID_AUTHENTICATION=SubscriptionId={SubId};UserId={orgId};AADTenant={tenantId};Environment={env};HttpRecorderMode=Record;
+
+#### 7.1 Supported Key=Value pairs in Connectionstring
 	* ManagementCertificate
 	* SubscriptionId
 	* AADTenant
 	* UserId
 	* Password
 	* ServicePrincipal
 	* ServicePrincipalSecret
-	* Environment={Prod | DogFood | Next | Current}
+	* Environment={Prod | DogFood | Next | Current | Custom}
 	* RawToken
 	* RawGraphToken
 	* HttpRecorderMode={Record | Playback}
@@ -129,10 +134,9 @@ Ensure that the `HttpRecorderMode` in the `TEST_CSM_ORGID_AUTHENTICATION` enviro
 	* AADAuthEndpoint
 	* GraphTokenAudienceUri
 
+## 8. Supported Environment in Test framework (Azure environments)
 
-#### 7.2 Environment Defaults
-
-Setting `Environment` in the connection string will result in the following default values:
+#### 8.1 Default Environments and associated Uri
 
 ##### Environment = Prod
 
@@ -189,3 +193,11 @@ Setting `Environment` in the connection string will result in the following defa
         GraphTokenAudienceUri = "https://graph.ppe.windows.net/"
         DataLakeStoreServiceUri = "https://caboaccountdogfood.net"
         DataLakeAnalyticsJoAbndCatalogServiceUri = "https://konaaccountdogfood.net"
+
+##### Environment = Custom
+When specified, test framework expect all Uri's to be provided by the user as part of the connection string.
+
+What is also supported is as below (connections string example)
+>SubscriptionId=subId;Environment=Prod;AADAuthUri=customAuthUri;ResourceManagementUri=CustomR>esourceMgmtUri
+
+Which translates to, all Uri from pre-defined Prod environment will be used, but AADAuthUri and ResourceManagementUri will be overridden by the one provided in the connection string