Merge branch 'az022' of github.com:markcowl/azure-powershell into az022

Author: markcowl

README.md

@@ -16,7 +16,7 @@ Below is a table containing the various Azure PowerShell rollup modules found in
 | 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 .NET Standard cmdlets                         | `Az` | [![Az](https://img.shields.io/powershellgallery/v/Az.svg?style=flat-square&label=Az)](https://www.powershellgallery.com/packages/Az/) |
 | 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/) |
 | Rollup 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/) |
 

src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs

@@ -556,6 +556,9 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
     'Remove-AzDataFactoryV2Pipeline': 'Remove-AzureRmDataFactoryV2Pipeline',
     'Remove-AzDataFactoryV2IntegrationRuntimeNode': 'Remove-AzureRmDataFactoryV2IntegrationRuntimeNode'
   },
+  'Az.ResourceGraph': {
+    'Search-AzGraph':  'Search-AzureRmGraph'
+  },
   'Az.PolicyInsights': {
     'Get-AzPolicyEvent': 'Get-AzureRmPolicyEvent',
     'Get-AzPolicyState': 'Get-AzureRmPolicyState',

src/ResourceManager/RedisCache/Commands.RedisCache/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Allow any string as Size parameter going forward. Add P5 in PSArgumentCompleter popup
 
 ## Version 5.0.6
 * Updated Insights dependency.

src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs

@@ -41,10 +41,10 @@ public class NewAzureRedisCache : RedisCacheCmdletBase
         [ValidateNotNullOrEmpty]
         public string Location { get; set; }
 
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB")]
-        [ValidateSet(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String,
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, P5, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB, 120GB")]
+        [PSArgumentCompleter(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String, SizeConverter.P5String,
             SizeConverter.C0String, SizeConverter.C1String, SizeConverter.C2String, SizeConverter.C3String, SizeConverter.C4String, SizeConverter.C5String, SizeConverter.C6String,
-            SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, IgnoreCase = false)]
+            SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, SizeConverter.GB120)]
         public string Size { get; set; }
 
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Choose to create a Basic, Standard, or Premium cache.")]

src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs

@@ -35,10 +35,10 @@ public class SetAzureRedisCache : RedisCacheCmdletBase
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB")]
-        [ValidateSet(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String,
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, P5, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB, 120GB")]
+        [PSArgumentCompleter(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String, SizeConverter.P5String,
             SizeConverter.C0String, SizeConverter.C1String, SizeConverter.C2String, SizeConverter.C3String, SizeConverter.C4String, SizeConverter.C5String, SizeConverter.C6String,
-            SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, IgnoreCase = false)]
+            SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, SizeConverter.GB120)]
         public string Size { get; set; }
 
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Choose to create a Basic, Standard, or Premium cache.")]

src/ResourceManager/RedisCache/Commands.RedisCache/Models/SizeConverter.cs

@@ -25,6 +25,7 @@ internal static class SizeConverter
         public const string GB13 = "13GB";
         public const string GB26 = "26GB";
         public const string GB53 = "53GB";
+        public const string GB120 = "120GB";
 
         public const string C0String = "C0";
         public const string C1String = "C1";
@@ -38,6 +39,7 @@ internal static class SizeConverter
         public const string P2String = "P2";
         public const string P3String = "P3";
         public const string P4String = "P4";
+        public const string P5String = "P5";
 
         private static Dictionary<string, string> skuStringToActualSize = new Dictionary<string, string>{
             { C0String, MB250 },
@@ -50,7 +52,8 @@ internal static class SizeConverter
             { P1String, GB6 },
             { P2String, GB13 },
             { P3String, GB26 },
-            { P4String, GB53 }
+            { P4String, GB53 },
+            { P5String, GB120 }
         };
 
         public static string GetSizeInRedisSpecificFormat(string actualSizeFromUser, bool isPremiumCache)
@@ -100,6 +103,8 @@ public static string GetSizeInRedisSpecificFormat(string actualSizeFromUser, boo
                     {
                         return C6String;
                     }
+                case GB120:
+                    return P5String;
                 // accepting C0, C1 etc.
                 default:
                     return actualSizeFromUser;

src/ResourceManager/ResourceGraph/Commands.ResourceGraph/Az.ResourceGraph.psd1

@@ -72,7 +72,7 @@
         FunctionsToExport = @()
 
         # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-        CmdletsToExport = 'Search-AzureRmGraph'
+        CmdletsToExport = 'Search-AzGraph'
 
         # Variables to export from this module
         # VariablesToExport = @()

src/ResourceManager/Security/Commands.Security/AzureRM.Security.psd1

@@ -30,7 +30,7 @@ CompanyName = 'Microsoft Corporation'
 Copyright = 'Microsoft Corporation. All rights reserved.'
 
 # Description of the functionality provided by this module
-Description = 'Microsoft Azure PowerShell - Azure Security Center cmdlets in PowerShell and PowerShell Core. Allows managing and monitoring the security posture of your resources.'
+Description = 'Microsoft Azure PowerShell - Azure Security Center cmdlets in PowerShell and PowerShell Core. Allows managing and monitoring the security posture of your resources. for more information visit https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/AzureRM.Security.md'
 
 # Minimum version of the Windows PowerShell engine required by this module
 PowerShellVersion = '5.0'
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.6.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.5.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.SecurityCenter.dll'

src/ResourceManager/Security/Commands.Security/ChangeLog.md

@@ -19,6 +19,10 @@
 -->
 ## Current Release
 
+## Version 0.2.0
+
+* Aligning AzureRm.Profile dependency with the rest of AzureRm and updating documentation notes
+
 ## Version 0.1.0
 
 * Public preview release of Security Center cmdlets

src/ResourceManager/Security/Commands.Security/Commands.Security.csproj

@@ -125,6 +125,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="AzureRM.Security.psd1" />
+    <None Include="ChangeLog.md" />
     <None Include="help\*.md" />
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config" />

src/ResourceManager/Security/Commands.Security/Common/ParameterHelpMessages.cs

@@ -21,7 +21,7 @@ public static class ParameterHelpMessages
         public const string SubscriptionId = "Subscription ID.";
         public const string ResourceGroupName = "Resource group name.";
         public const string ResourceName = "Resource name.";
-        public const string ResourceId = "Resource ID.";
+        public const string ResourceId = "ID of the security resource that you want to invoke the command on.";
         public const string Scope = "Scope.";
         public const string Kind = "Kind.";
         public const string InputObject = "Input Object.";
@@ -65,7 +65,7 @@ public static class ParameterHelpMessages
 
         #region JIT Network Access Policies
 
-        public const string VirutalMachines = "Virutal Machines.";
+        public const string VirutalMachines = "Virtual Machines.";
 
         #endregion
     }

src/ResourceManager/Security/Commands.Security/help/AzureRM.Security.md

@@ -1,7 +1,7 @@
 ---
 Module Name: AzureRM.Security
 Module Guid: 5e312bb4-9d3a-4c88-94c3-8e5bbb2e3da4
-Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.security
+Download Help Link: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/AzureRM.Security.md
 Help Version: 0.1.0
 Locale: en-US
 ---
@@ -27,7 +27,7 @@ Gets security alerts that were detected by Azure Security Center
 Gets the security automatic provisioning settings
 
 ### [Get-AzureRmSecurityCompliance](Get-AzureRmSecurityCompliance.md)
-Get the security compliace of a subscription over time
+Get the security compliance of a subscription over time
 
 ### [Get-AzureRmSecurityContact](Get-AzureRmSecurityContact.md)
 Gets security contacts that were configured on this subscription

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmDiscoveredSecuritySolution.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azureiscoveredsecuritysolution
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmDiscoveredSecuritySolution.md
 schema: 2.0.0
 ---
 
@@ -30,7 +30,7 @@ Get-AzureRmDiscoveredSecuritySolution -ResourceId <String> [-DefaultProfile <IAz
 ```
 
 ## DESCRIPTION
-Security solutions are automatcally discovered by Azure Security Center, use this cmdlet to view the discovered security solutions
+Security solutions are automatically discovered by Azure Security Center, use this cmdlet to view the discovered security solutions
 
 ## EXAMPLES
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmExternalSecuritySolution.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermexternalsecuritysolution
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmExternalSecuritySolution.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmJitNetworkAccessPolicy.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermjitnetworkaccesspolicy
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmJitNetworkAccessPolicy.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityAlert.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecurityalert
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityAlert.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityAutoProvisioningSetting.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecurityautoprovisioningsetting
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityAutoProvisioningSetting.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityCompliance.md

@@ -1,14 +1,14 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecuritycompliance
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityCompliance.md
 schema: 2.0.0
 ---
 
 # Get-AzureRmSecurityCompliance
 
 ## SYNOPSIS
-Get the security compliace of a subscription over time
+Get the security compliance of a subscription over time
 
 ## SYNTAX
 
@@ -29,7 +29,7 @@ Get-AzureRmSecurityCompliance -ResourceId <String> [-DefaultProfile <IAzureConte
 ```
 
 ## DESCRIPTION
-Gets the security compliace of a subscription based on the current healthy and non secured resources retio on this subscription.
+Gets the security compliance of a subscription based on the current healthy and non secured resources ratio on this subscription.
 The security compliance is calculated every day and the history is saved.
 
 ## EXAMPLES
@@ -124,7 +124,7 @@ AssessmentTimestampUtcDate : 07/08/2018 00:00:00
 AssessmentResult           : {Microsoft.Azure.Commands.Security.Models.Compliances.PSSecurityComplianceSegment}
 ```
 
-Gets the security compliace of a subscription for the last 14 days
+Gets the security compliance of a subscription for the last 14 days
 
 ### Example 2
 ```powershell
@@ -138,7 +138,7 @@ AssessmentTimestampUtcDate : 20/08/2018 00:00:00
 AssessmentResult           : {Microsoft.Azure.Commands.Security.Models.Compliances.PSSecurityComplianceSegment}
 ```
 
-Gets the security compliace of a subscription on a specific date
+Gets the security compliance of a subscription on a specific date
 
 ## PARAMETERS
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityContact.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecuritycontact
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityContact.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityLocation.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecuritylocation
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityLocation.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityPricing.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecuritypricing
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityPricing.md
 schema: 2.0.0
 ---
 
@@ -40,7 +40,7 @@ Get-AzureRmSecurityPricing -ResourceId <String> [-DefaultProfile <IAzureContextC
 ```
 
 ## DESCRIPTION
-Azure Security Cetner pricing tier is decided per scope, with this cmdlet you can get the configured pricing tiers.
+Azure Security Center pricing tier is decided per scope, with this cmdlet you can get the configured pricing tiers.
 Subscription pricing tier include all the resource groups under it.
 Resource Group pricing tier will override the subscription pricing tier.
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityTask.md

@@ -1,14 +1,14 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecuritytask
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityTask.md
 schema: 2.0.0
 ---
 
 # Get-AzureRmSecurityTask
 
 ## SYNOPSIS
-Gets the security tasks that Azure Security Center recommands you to do in order to strengthen your security posture.
+Gets the security tasks that Azure Security Center recommends you to do in order to strengthen your security posture.
 
 ## SYNTAX
 
@@ -41,7 +41,7 @@ Get-AzureRmSecurityTask -ResourceId <String> [-DefaultProfile <IAzureContextCont
 
 ## DESCRIPTION
 Azure Security Center scans your resources to detect potential security issues.
-This cmdlet lets you dicover the security tasks that Azure Security Center recommands you to do.
+This cmdlet lets you discover the security tasks that Azure Security Center recommends you to do.
 
 ## EXAMPLES
 

src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityWorkspaceSetting.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/get-azurermsecurityworkspacesetting
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Get-AzureRmSecurityWorkspaceSetting.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Remove-AzureRmJitNetworkAccessPolicy.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/remove-azurermjitnetworkaccesspolicy
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Remove-AzureRmJitNetworkAccessPolicy.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Remove-AzureRmSecurityContact.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/remove-azurermsecuritycontact
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Remove-AzureRmSecurityContact.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Remove-AzureRmSecurityWorkspaceSetting.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/remove-azurermsecurityworkspacesetting
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Remove-AzureRmSecurityWorkspaceSetting.md
 schema: 2.0.0
 ---
 

src/ResourceManager/Security/Commands.Security/help/Set-AzureRmJitNetworkAccessPolicy.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.SecurityCenter.dll-Help.xml
 Module Name: AzureRM.Security
-online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.security/set-azurermjitnetworkaccesspolicy
+online version: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/Set-AzureRmJitNetworkAccessPolicy.md
 schema: 2.0.0
 ---