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

Author: frankguodongchen

CONTRIBUTING.md

@@ -148,7 +148,9 @@ The following guidelines must be followed in **EVERY** pull request that is open
 
 The following guidelines must be followed in pull requests that add, edit, or remove a cmdlet.
 
-- Cmdlet name uses an approved PowerShell verb - use enums for `VerbsCommon`, `VerbsCommunication`, `VerbLifecycle`, `VerbsOther` whenever possible
+- Cmdlet name uses an approved PowerShell verb - use enums for `VerbsCommon`, `VerbsCommunication`, `VerbsData`, `VerbsDiagnostic`, `VerbsLifecycle`, `VerbsOther`, and `VerbsSecurity` whenever possible
+    - Note that you can see a list of all approved PowerShell verbs by running `Get-Verb` in PowerShell
+    - When a verb you would like to use is not in the list of approved verbs, or to get ideas on how to use verbs, consult the [Approved Verbs for Windows PowerShell Commands](https://msdn.microsoft.com/en-us/library/ms714428\(v=vs.85\).aspx) documentation where you will find descriptions of approved verbs as well as related verbs in the comments so that you can find one appropriate for your command
 - Cmdlet noun name uses the AzureRm prefix for management cmdlets, and the Azure prefix for data plane cmdlets
 - Cmdlet specifies the `OutputType` attribute if any output is produced; if the cmdlet produces no output, it should implement a `PassThrough` parameter
 - If the cmdlet makes changes or has side effects, it should implement `ShouldProcess` and have `SupportsShouldProcess = true` specified in the cmdlet attribute. See a discussion about correct `ShouldProcess` implementation [here](https://gist.github.com/markcowl/338e16fe5c8bbf195aff9f8af0db585d#what-is-the-change).

documentation/Using-Azure-TestFramework.md

@@ -18,7 +18,7 @@
 	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-Commands -Module Repo-Tasks to see list of cmdlets
+	2. Type Get-Command -Module Repo-Tasks to see list of cmdlets
 	3. Get-Help <CommandName> to get help on individual commands.
 
 ## 2. Accquring TestFramework

setup/azurecmdfiles.wxi

@@ -147,9 +147,6 @@
                         <Component Id="cmpBEA6E3263480C18705DC2E3B15E3C1CF" Guid="*">
                             <File Id="fil7E95F218EFC39408F9F2DB3FD01A124C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AutoMapper.dll" />
                         </Component>
-                        <Component Id="cmp957D146263F021CE3EF1CBADBF06D2C4" Guid="*">
-                            <File Id="fil3B64A78FBE060D1999F5155A4FC7A5A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AutoMapper.Net4.dll" />
-                        </Component>
                         <Component Id="cmp5FB922E1DB9224DAB3732AEA3ECC0388" Guid="*">
                             <File Id="fil5213407D51829D166CAC13B03BB3E5D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AzureRM.ApiManagement.psd1" />
                         </Component>
@@ -770,9 +767,6 @@
                         <Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
                             <File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
                         </Component>
-                        <Component Id="cmp22A6F693AF6FBFD6498C688650850591" Guid="*">
-                            <File Id="filA6AB6542AE249CFD2B0A551B0685C0C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.Net4.dll" />
-                        </Component>
                         <Component Id="cmp594709EB2E69BD7173BC8833BE2061B4" Guid="*">
                             <File Id="filEF7117E1317C1E3E14DF115DF4490BA3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRM.Compute.psd1" />
                         </Component>
@@ -2437,9 +2431,6 @@
                         <Component Id="cmp33F39A22183184A6B41F85DF085BAD29" Guid="*">
                             <File Id="fil55AEBBBFEF03FD95E26F163516FF2E54" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AutoMapper.dll" />
                         </Component>
-                        <Component Id="cmp70B60DBD32D61BCA5715AB2D64131358" Guid="*">
-                            <File Id="filF785DC83C86073F482446C70517349AF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AutoMapper.Net4.dll" />
-                        </Component>
                         <Component Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" Guid="*">
                             <File Id="fil073D08239CE53D9BDD13AB4040BF2180" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureRM.Network.psd1" />
                         </Component>
@@ -2994,9 +2985,6 @@
                         <Component Id="cmp0771616382C276888CCCCAEDE5A4A116" Guid="*">
                             <File Id="fil3A2FA9FED44014FB034C65AE36153CCE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\AutoMapper.dll" />
                         </Component>
-                        <Component Id="cmpCCE9F48369C0A7D8A62E453BBDD3BA60" Guid="*">
-                            <File Id="fil9F99200863B45D3C4CAA2165474C1154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\AutoMapper.Net4.dll" />
-                        </Component>
                         <Component Id="cmpAC48F0FFA8AD61A159AE77B4461BF0A1" Guid="*">
                             <File Id="filF5C89CCF397E88A4026855A0D2C52D03" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\AzureRM.RecoveryServices.psd1" />
                         </Component>
@@ -4400,9 +4388,6 @@
                         <Component Id="cmpD31EE6D7925E4DAECBC12F02B2C896AA" Guid="*">
                             <File Id="fil5E38548DB973410FC004A041113E5421" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\AutoMapper.dll" />
                         </Component>
-                        <Component Id="cmpDFC157C3442E97BDF0570FFD8C7B977D" Guid="*">
-                            <File Id="filCDCF5E4FDFBA13866B504E33B24C6195" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\AutoMapper.Net4.dll" />
-                        </Component>
                         <Component Id="cmp4BF22B003CB6023A1EABDD3AE357872E" Guid="*">
                             <File Id="filAFC87FC699D2AD74AA2D8FB62EE910B0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Azure.psd1" />
                         </Component>
@@ -4784,9 +4769,6 @@
                         <Component Id="cmpAB9D9954A1CC38F64EDAC5266657C35E" Guid="*">
                             <File Id="filF838B2660677A0427291EE91BAF3C885" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\AutoMapper.dll" />
                         </Component>
-                        <Component Id="cmpB2A7275C2B928AA4B05A2C6CCAEDB373" Guid="*">
-                            <File Id="fil10AC900CA72AF74C1282D479947DDA0C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\AutoMapper.Net4.dll" />
-                        </Component>
                         <Component Id="cmpE341C9178CD349DCB605EB78561663C9" Guid="*">
                             <File Id="fil1D6B292A5C5BC3CFC39CC35067D40538" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Azure.psd1" />
                         </Component>
@@ -5140,9 +5122,6 @@
                         <Component Id="cmp5F55270F607737A772BFBE2D8F6B76E4" Guid="*">
                             <File Id="filF7E717D6789D9D4D072D3BA81461FCB3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\AutoMapper.dll" />
                         </Component>
-                        <Component Id="cmp9EF03D7C53CEE400751AD1905625B82B" Guid="*">
-                            <File Id="fil1F623F47BC709C9D252862AC58BB467C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\AutoMapper.Net4.dll" />
-                        </Component>
                         <Component Id="cmpC4F524A9EBF63DAC78B9678CF113D652" Guid="*">
                             <File Id="fil9FEAB9D127D01AF382317A68BDBAE174" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Azure.psd1" />
                         </Component>
@@ -5998,7 +5977,6 @@
             <ComponentRef Id="cmp4239E298007039D73447BCF1C811AFFF" />
             <ComponentRef Id="cmp52FA0519C93110702BAA6D4D39EED5A4" />
             <ComponentRef Id="cmpBEA6E3263480C18705DC2E3B15E3C1CF" />
-            <ComponentRef Id="cmp957D146263F021CE3EF1CBADBF06D2C4" />
             <ComponentRef Id="cmp5FB922E1DB9224DAB3732AEA3ECC0388" />
             <ComponentRef Id="cmp7356D01A9E7869ACE3727CF75BD7E0CB" />
             <ComponentRef Id="cmp2E3A58C9336220FF001B6912E569A1C3" />
@@ -6200,7 +6178,6 @@
             <ComponentRef Id="cmp3D82D19F427B152BB3BB2BAD217958C2" />
             <ComponentRef Id="cmpFDA0979F65585F21A39465A3177C778A" />
             <ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
-            <ComponentRef Id="cmp22A6F693AF6FBFD6498C688650850591" />
             <ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />
             <ComponentRef Id="cmp4677B0CE124023330EDD7AA4FECFF45E" />
             <ComponentRef Id="cmpCC409403AF670A9E0538AC743C61BD66" />
@@ -6741,7 +6718,6 @@
             <ComponentRef Id="cmpE3675757E9A4594575D644697F2511CE" />
             <ComponentRef Id="cmp40E1A281AD8C136D20FD0CC6C3A5D54C" />
             <ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
-            <ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
             <ComponentRef Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" />
             <ComponentRef Id="cmp80BCFE8BC9E31ADA65ADD4B0ADA2A4C4" />
             <ComponentRef Id="cmp7422E480DBC8B16B0BF2E5387A594B0B" />
@@ -6922,7 +6898,6 @@
             <ComponentRef Id="cmp4C0352326E88F3944C388E2F8F24D0BA" />
             <ComponentRef Id="cmpCA10090D9DBBEA0C6A7D6462DB2D0611" />
             <ComponentRef Id="cmp0771616382C276888CCCCAEDE5A4A116" />
-            <ComponentRef Id="cmpCCE9F48369C0A7D8A62E453BBDD3BA60" />
             <ComponentRef Id="cmpAC48F0FFA8AD61A159AE77B4461BF0A1" />
             <ComponentRef Id="cmp7046713066487041F1101B42659052B1" />
             <ComponentRef Id="cmp1BA726DB262180ED2598DA99F6FD43C0" />
@@ -7376,7 +7351,6 @@
             <ComponentRef Id="cmp01E003A3FA26FB81C6B89817FE7250BE" />
             <ComponentRef Id="cmp5E7A927FFF2CD1AC2D9A4D4746132F63" />
             <ComponentRef Id="cmpD31EE6D7925E4DAECBC12F02B2C896AA" />
-            <ComponentRef Id="cmpDFC157C3442E97BDF0570FFD8C7B977D" />
             <ComponentRef Id="cmp4BF22B003CB6023A1EABDD3AE357872E" />
             <ComponentRef Id="cmp51ECC6BA35E7D95A12F581DD08E66F64" />
             <ComponentRef Id="cmpECEA3A8AB38FEEEC397A918E3448B3FF" />
@@ -7502,7 +7476,6 @@
             <ComponentRef Id="cmpB5F241C0863E789EFB3F330351AF23A0" />
             <ComponentRef Id="cmp403B76F26F2AB3EBEC4773C05C428394" />
             <ComponentRef Id="cmpAB9D9954A1CC38F64EDAC5266657C35E" />
-            <ComponentRef Id="cmpB2A7275C2B928AA4B05A2C6CCAEDB373" />
             <ComponentRef Id="cmpE341C9178CD349DCB605EB78561663C9" />
             <ComponentRef Id="cmpB3830B2F5405EB63585D70D9B4A8083B" />
             <ComponentRef Id="cmp609ECF22CBCD5D733FA476301D478408" />
@@ -7618,7 +7591,6 @@
             <ComponentRef Id="cmp0B4140C0041F650FB202F15FD4F86721" />
             <ComponentRef Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" />
             <ComponentRef Id="cmp5F55270F607737A772BFBE2D8F6B76E4" />
-            <ComponentRef Id="cmp9EF03D7C53CEE400751AD1905625B82B" />
             <ComponentRef Id="cmpC4F524A9EBF63DAC78B9678CF113D652" />
             <ComponentRef Id="cmp401224722DA5F5678A1230A4DEC4B453" />
             <ComponentRef Id="cmp2970C04AAF17425A9A2994CDC024E65D" />

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

@@ -53,6 +53,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeStoreFileSystemEndpointSuffix = AzureEnvironmentConstants.AzureDataLakeStoreFileSystemEndpointSuffix,
                     GraphEndpointResourceId = AzureEnvironmentConstants.AzureGraphEndpoint,
                     DataLakeEndpointResourceId = AzureEnvironmentConstants.AzureDataLakeServiceEndpointResourceId,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.BatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             },
@@ -77,6 +78,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.ChinaGraphEndpoint,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.ChinaBatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             },
@@ -101,6 +103,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.USGovernmentGraphEndpoint,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             },
@@ -125,6 +128,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.GermanGraphEndpoint,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             }
@@ -228,6 +232,11 @@ public AzureEnvironment(IAzureEnvironment other)
         /// </summary>
         public string DataLakeEndpointResourceId { get; set; }
 
+        /// <summary>
+        /// The token audience required for communicating with the Batch service in this enviornment
+        /// </summary>
+        public string BatchEndpointResourceId { get; set; }
+
         /// <summary>
         /// The domain name suffix for Azure DataLake Catalog and Job services created in this environment
         /// </summary>
@@ -275,7 +284,8 @@ public static class Endpoint
                 ManagementPortalUrl = "ManagementPortalUrl",
                 AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix",
                 AzureDataLakeStoreFileSystemEndpointSuffix = "AzureDataLakeStoreFileSystemEndpointSuffix",
-                DataLakeEndpointResourceId = "DataLakeEndpointResourceId";
+                DataLakeEndpointResourceId = "DataLakeEndpointResourceId",
+                BatchEndpointResourceId = "BatchEndpointResourceId";
 
         }
     }

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs

@@ -125,5 +125,10 @@ public static class AzureEnvironmentConstants
         /// The token audience for authorizing DataLake requests
         /// </summary>
         public const string AzureDataLakeServiceEndpointResourceId = "https://datalake.azure.net";
+
+        public const string BatchEndpointResourceId = "https://batch.core.windows.net/";
+        public const string ChinaBatchEndpointResourceId = "https://batch.chinacloudapi.cn/";
+        public const string USGovernmentBatchEndpointResourceId = "https://batch.core.usgovcloudapi.net/";
+        public const string GermanBatchEndpointResourceId = "https://batch.cloudapi.de/";
     }
 }

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

@@ -65,6 +65,9 @@ public static bool TryGetEndpointUrl(this IAzureEnvironment environment, string
                 case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
                     endpoint = new Uri(environment.DataLakeEndpointResourceId);
                     break;
+                case AzureEnvironment.Endpoint.BatchEndpointResourceId:
+                    endpoint = new Uri(environment.BatchEndpointResourceId);
+                    break;
                 default:
                     result = false;
                     break;
@@ -138,6 +141,9 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
                     case AzureEnvironment.Endpoint.ServiceManagement:
                         propertyValue = environment.ServiceManagementUrl;
                         break;
+                    case AzureEnvironment.Endpoint.BatchEndpointResourceId:
+                        propertyValue = environment.BatchEndpointResourceId;
+                        break;
                     default:
                         break;
                 }
@@ -226,6 +232,9 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
                     case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
                         environment.DataLakeEndpointResourceId = propertyValue;
                         break;
+                    case AzureEnvironment.Endpoint.BatchEndpointResourceId:
+                        environment.BatchEndpointResourceId = propertyValue;
+                        break;
                     case AzureEnvironment.Endpoint.ActiveDirectory:
                         environment.ActiveDirectoryAuthority = propertyValue;
                         break;
@@ -440,6 +449,10 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
                     environment.AzureKeyVaultServiceEndpointResourceId =
                          other.AzureKeyVaultServiceEndpointResourceId;
                 }
+                if (other.IsEndpointSet(AzureEnvironment.Endpoint.BatchEndpointResourceId))
+                {
+                    environment.BatchEndpointResourceId = other.BatchEndpointResourceId;
+                }
 
                 environment.VersionProfiles.Clear();
                 foreach (var profile in other.VersionProfiles)

src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IAzureEnvironment.cs

@@ -107,6 +107,11 @@ public interface IAzureEnvironment : IExtensibleModel
         /// </summary>
         string DataLakeEndpointResourceId { get; set; }
 
+        /// <summary>
+        /// The token audience required to authenticate with the Azure Batch service
+        /// </summary>
+        string BatchEndpointResourceId { get; set; }
+
         /// <summary>
         ///  The domain name suffix for Azure DataLake Catalog and Job services
         /// </summary>

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Get-AzureRmAnalysisServicesServer.md

@@ -1,5 +1,6 @@
 ---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
+Module Name: AzureRM.AnalysisServices
 online version: 
 schema: 2.0.0
 ---
@@ -12,7 +13,8 @@ Gets the details of an Analysis Services server.
 ## SYNTAX
 
 ```
-Get-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [[-Name] <String>] [<CommonParameters>]
+Get-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [[-Name] <String>]
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -36,6 +38,21 @@ This command gets the Azure Analysis Services server named testserver in the res
 
 ## PARAMETERS
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with azure.
+
+```yaml
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 Name of the Analysis Services server