Merge branch 'preview' into fourth

Author: maddieclayton

.gitattributes

@@ -5,4 +5,7 @@
 *.cs text eol=crlf
 *.csproj text eol=crlf
 *.ps1 text eol=crlf
+*.psd1 text eol=crlf
+*.psm1 text eol=crlf
+*.ps1xml text eol=crlf
 build.proj text eol=crlf

README.md

@@ -8,6 +8,17 @@ This repository contains a set of PowerShell cmdlets for developers and administ
 * For comprehensive documentation on the developer cmdlets see the [overview of Azure PowerShell](https://aka.ms/azpsdocs).
 * For suggesting improvements, join our improvement discussion ([Issue #3692](https://github.com/Azure/azure-powershell/issues/3692)).
 
+## Modules
+
+Below is a table containing the various Azure PowerShell rollup modules found in this repository. For a full list of modules found in this repository, please see the [Azure PowerShell Modules](documentation/azure-powershell-modules.md) page.
+
+| Description                                                     | Module Name       | PowerShell Gallery Link |
+| --------------------------------------------------------------- | ----------------- | ----------------------- |
+| Rollup Module for ARM Cmdlets                                   | `AzureRM`         | [![AzureRM](https://img.shields.io/powershellgallery/v/AzureRM.svg?style=flat-square&label=AzureRM)](https://www.powershellgallery.com/packages/AzureRM/) |
+| Rollup Module for .NET Core Cmdlets                             | `AzureRM.Netcore` | [![AzureRM.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Netcore.svg?style=flat-square&label=AzureRM.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Netcore/) |
+| Rollup Module for Administrative Modules in Azure Stack         | `AzureStack`      | [![AzureStack](https://img.shields.io/powershellgallery/v/AzureStack.svg?style=flat-square&label=AzureStack)](https://www.powershellgallery.com/packages/AzureStack/) |
+| Rolledup Module for Service Management Cmdlets                  | `Azure`           | [![Azure](https://img.shields.io/powershellgallery/v/Azure.svg?style=flat-square&label=Azure)](https://www.powershellgallery.com/packages/Azure/) |
+
 ## Features
 
 * Account management

documentation/azure-powershell-modules.md

@@ -24,6 +24,7 @@
     <Icon Id="icon.ico" SourceFile="media\WAIcon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
     <Property Id="ALLUSERS" Value="1" />
+    <Property Id="ISVSINSTALL" Secure="yes"/>
     <!-- per machine install-->
     <Property Id="PSCOMPATIBLEVERSION">
       <RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
@@ -51,7 +52,7 @@
     <Condition Message="This setup requires the .NET Framework 4.5.2 or higher to be installed.">
       <!-- NETFRAMEWORK45 contains a DWORD with installed version key to versions is here: -->
       <!-- https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx#detect_net -->
-      <![CDATA[Installed or (NETFRAMEWORK45 >= "#379893")]]>
+      <![CDATA[Installed or (NETFRAMEWORK45 >= "#379893") or ISVSINSTALL]]>
     </Condition>
 
     <Directory Id="TARGETDIR" Name="SourceDir">

setup/azurecmd.wxs

@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices
     public class SetAzureAnalysisServicesServer : AnalysisServicesCmdletBase
     {
         private const string ParamSetDefault = "Default";
-        private const string ParamSetDisableBackup = "Disable Backup";
+        private const string ParamSetDisableBackup = "DisableBackup";
 
         [Parameter(ValueFromPipelineByPropertyName = true, Position = 0, Mandatory = true,
             HelpMessage = "Name of the server.")]

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/SetAzureRmAnalysisServicesServer.cs

@@ -19,7 +19,7 @@ Set-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
-### Disable Backup
+### DisableBackup
 ```
 Set-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [[-Sku] <String>]
  [[-Tag] <Hashtable>] [[-Administrator] <String>] [-PassThru] [-DisableBackup]
@@ -93,7 +93,7 @@ To re-enable the backup blob container, please provide the backup blob container
 
 ```yaml
 Type: SwitchParameter
-Parameter Sets: Disable Backup
+Parameter Sets: DisableBackup
 Aliases: 
 
 Required: True

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

@@ -27,8 +27,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(string))]
     public class ExportAzureApiManagementApi : AzureApiManagementCmdletBase
     {
-        private const string ExportContentToPipeline = "Export to pipeline";
-        private const string ExportToFile = "Export to File";
+        private const string ExportContentToPipeline = "ExportToPipeline";
+        private const string ExportToFile = "ExportToFile";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/ExportAzureApiManagementApi.cs

@@ -24,10 +24,10 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementApi), ParameterSetName = new[] { FindById })]
     public class GetAzureApiManagementApi : AzureApiManagementCmdletBase
     {
-        private const string FindByProductId = "Find by product ID";
-        private const string FindByName = "Find by Name";
-        private const string FindById = "Find by ID";
-        private const string AllApis = "All APIs";
+        private const string FindByProductId = "GetByProductId";
+        private const string FindByName = "GetByName";
+        private const string FindById = "GetByApiId";
+        private const string AllApis = "GetAllApis";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementApi.cs

@@ -24,8 +24,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementOAuth2AuthrozationServer), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementAuthorizationServer : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all authorization server";
-        private const string GetById = "Get by Id";
+        private const string GetAll = "GetAllAuthorizationServers";
+        private const string GetById = "GetByServerId";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementAuthorizationServer.cs

@@ -24,8 +24,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementBackend), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementBackend : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all backends";
-        private const string GetById = "Get by backend ID";
+        private const string GetAll = "GetAllBackends";
+        private const string GetById = "GetByBackendId";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementBackend.cs

@@ -25,8 +25,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementCertificate), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementCertificate : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all certificates";
-        private const string GetById = "Get certificate by ID";
+        private const string GetAll = "GetAllCertificates";
+        private const string GetById = "GetByCertificateId";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementCertificate.cs

@@ -24,10 +24,10 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementGroup), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementGroup : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all groups";
-        private const string GetById = "Get by group ID";
-        private const string FindByUser = "Find groups by user";
-        private const string FindByProduct = "Find groups by product";
+        private const string GetAll = "GetAllGroups";
+        private const string GetById = "GetByGroupId";
+        private const string FindByUser = "GetByUserId";
+        private const string FindByProduct = "GetByProductId";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementGroup.cs

@@ -24,8 +24,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementLogger), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementLogger : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all loggers";
-        private const string GetById = "Get by logger ID";
+        private const string GetAll = "GetAllLoggers";
+        private const string GetById = "GetByLoggerId";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementLogger.cs

@@ -24,9 +24,9 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementOpenIdConnectProvider), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementOpenIdConnectProvider : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all OpenID Connect Providers";
-        private const string GetById = "Get by OpenID Connect Provider ID";
-        private const string FindByName = "Find by OpenID Connect Provider friendly Name";
+        private const string GetAll = "GetAllOpenIdConnectProviders";
+        private const string GetById = "GetByOpenIdConnectProviderId";
+        private const string FindByName = "GetByName";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementOpenIdConnectProvider.cs

@@ -24,8 +24,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementOperation), ParameterSetName = new[] { FindById })]
     public class GetAzureApiManagementOperation : AzureApiManagementCmdletBase
     {
-        private const string FindById = "Find by ID";
-        private const string AllApiOperations = "All API Operations";
+        private const string FindById = "GetById";
+        private const string AllApiOperations = "GetAllApiOperations";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementOperation.cs

@@ -28,10 +28,10 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     public class GetAzureApiManagementPolicy : AzureApiManagementCmdletBase
     {
         private const string DefaultFormat = "application/vnd.ms-azure-apim.policy+xml";
-        private const string TenantLevel = "Tenant level";
-        private const string ProductLevel = "Product level";
-        private const string ApiLevel = "API level";
-        private const string OperationLevel = "Operation level";
+        private const string TenantLevel = "GetTenantLevel";
+        private const string ProductLevel = "GetProductLevel";
+        private const string ApiLevel = "GetApiLevel";
+        private const string OperationLevel = "GetOperationLevel";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementPolicy.cs

@@ -24,9 +24,9 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementProduct), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementProduct : AzureApiManagementCmdletBase
     {
-        private const string GetAllProducts = "Get all producst";
-        private const string GetById = "Get by Id";
-        private const string GetByTitle = "Get by Title";
+        private const string GetAllProducts = "GetAllProducts";
+        private const string GetById = "GetByProductId";
+        private const string GetByTitle = "GetByTitle";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementProduct.cs

@@ -24,10 +24,10 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementProperty), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementProperty : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all properties";
-        private const string GetById = "Get by property ID";
-        private const string FindByName = "Find properties containing Name";
-        private const string FindByTag = "Find properties by Tag";
+        private const string GetAll = "GetAllProperties";
+        private const string GetById = "GetByPropertyId";
+        private const string FindByName = "GetByName";
+        private const string FindByTag = "GetByTag";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementProperty.cs

@@ -24,10 +24,10 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementSubscription), ParameterSetName = new[] { GetBySubscriptionId })]
     public class GetAzureApiManagementSubscription : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all subscriptions";
-        private const string GetBySubscriptionId = "Get by subsctiption ID";
-        private const string GetByUserId = "Get by user ID";
-        private const string GetByProductId = "Get by product ID";
+        private const string GetAll = "GetAllSubscriptions";
+        private const string GetBySubscriptionId = "GetBySubscriptionId";
+        private const string GetByUserId = "GetByUserId";
+        private const string GetByProductId = "GetByProductId";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementSubscription.cs

@@ -24,9 +24,9 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementUser), ParameterSetName = new[] { GetById })]
     public class GetAzureApiManagementUser : AzureApiManagementCmdletBase
     {
-        private const string GetAll = "Get all users";
-        private const string GetById = "Get user by ID";
-        private const string FindBy = "Find users";
+        private const string GetAll = "GeAllUsers";
+        private const string GetById = "GetByUserId";
+        private const string FindBy = "GetByUser";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementUser.cs

@@ -22,8 +22,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementApi))]
     public class ImportAzureApiManagementApi : AzureApiManagementCmdletBase
     {
-        private const string FromLocalFile = "From Local File";
-        private const string FromUrl = "From URL";
+        private const string FromLocalFile = "ImportFromLocalFile";
+        private const string FromUrl = "ImportFromUrl";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/ImportAzureApiManagementApi.cs

@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementCertificate))]
     public class NewAzureApiManagementCertificate : AzureApiManagementCmdletBase
     {
-        private const string FromFile = "Load from file";
+        private const string FromFile = "LoadFromFile";
         private const string Raw = "Raw";
 
         [Parameter(

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagementCertificate.cs

@@ -25,10 +25,10 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(bool))]
     public class RemoveAzureApiManagementPolicy : AzureApiManagementCmdletBase
     {
-        private const string TenantLevel = "Tenant level";
-        private const string ProductLevel = "Product level";
-        private const string ApiLevel = "API level";
-        private const string OperationLevel = "Operation level";
+        private const string TenantLevel = "RemoveTenantLevel";
+        private const string ProductLevel = "RemoveProductLevel";
+        private const string ApiLevel = "RemoveApiLevel";
+        private const string OperationLevel = "RemoveOperationLevel";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/RemoveAzureApiManagementPolicy.cs

@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     [OutputType(typeof(PsApiManagementCertificate))]
     public class SetAzureApiManagementCertificate : AzureApiManagementCmdletBase
     {
-        private const string FromFile = "Load from file";
+        private const string FromFile = "LoadFromFile";
         private const string Raw = "Raw";
 
         [Parameter(

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementCertificate.cs

@@ -26,10 +26,10 @@ public class SetAzureApiManagementPolicy : AzureApiManagementCmdletBase
     {
         private const string DefaultFormat = "application/vnd.ms-azure-apim.policy+xml";
 
-        private const string TenantLevel = "Tenant level";
-        private const string ProductLevel = "Product level";
-        private const string ApiLevel = "API level";
-        private const string OperationLevel = "Operation level";
+        private const string TenantLevel = "SetTenantLevel";
+        private const string ProductLevel = "SetProductLevel";
+        private const string ApiLevel = "SetApiLevel";
+        private const string OperationLevel = "SetOperationLevel";
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementPolicy.cs

@@ -22,9 +22,9 @@ namespace Microsoft.Azure.Commands.ApiManagement.Commands
     [Cmdlet(VerbsCommon.Get, "AzureRmApiManagement", DefaultParameterSetName = BaseParameterSetName), OutputType(typeof(List<PsApiManagement>))]
     public class GetAzureApiManagement : AzureApiManagementCmdletBase
     {
-        internal const string BaseParameterSetName = "All In Subscription";
-        internal const string ResourceGroupParameterSetName = "All In Resource Group";
-        internal const string ApiManagementParameterSetName = "Specific API Management Service";
+        internal const string BaseParameterSetName = "GetBySubscription";
+        internal const string ResourceGroupParameterSetName = "GetByResourceGroup";
+        internal const string ApiManagementParameterSetName = "GetByResource";
 
         [Parameter(
             ParameterSetName = ResourceGroupParameterSetName,

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/GetAzureApiManagement.cs

@@ -21,8 +21,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.Commands
     [Cmdlet(VerbsCommon.Set, "AzureRmApiManagementHostnames", DefaultParameterSetName = DefaultParameterSetName), OutputType(typeof(PsApiManagement))]
     public class SetAzureApiManagementHostnames : AzureApiManagementCmdletBase
     {
-        internal const string FromPsApiManagementInstanceSetName = "Set from provided PsApiManagement instance";
-        internal const string DefaultParameterSetName = "Specific API Management service";
+        internal const string FromPsApiManagementInstanceSetName = "SetFromPsApiManagementInstance";
+        internal const string DefaultParameterSetName = "SetSpecificService";
 
         [Parameter(
             ParameterSetName = FromPsApiManagementInstanceSetName,

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/SetAzureApiManagementHostnames.cs

@@ -23,8 +23,8 @@ namespace Microsoft.Azure.Commands.ApiManagement.Commands
     [Cmdlet(VerbsData.Update, "AzureRmApiManagementDeployment", DefaultParameterSetName = DefaultParameterSetName), OutputType(typeof(PsApiManagement))]
     public class UpdateAzureApiManagementDeployment : AzureApiManagementCmdletBase
     {
-        internal const string FromPsApiManagementInstanceSetName = "Update from PsApiManagement instance";
-        internal const string DefaultParameterSetName = "Specific API Management service";
+        internal const string FromPsApiManagementInstanceSetName = "UpdateFromPsApiManagementInstance";
+        internal const string DefaultParameterSetName = "UpdateSpecificService";
 
         [Parameter(
             ParameterSetName = FromPsApiManagementInstanceSetName,