Merge branch 'main' into adsandor/newver

Author: Sandido

.ci-config.json

@@ -264,10 +264,7 @@
         "tools/Gen2Master/*",
         "tools/InstallationTests/*",
         "tools/Installer/*",
-        "tools/NetCoreCsProjSync/*",
-        "tools/NetCorePsd1Sync/*",
         "tools/ProjectTemplates/*",
-        "tools/RepoTasks/*",
         "tools/SecurityTools/*",
         "tools/Test/*",
         "tools/Tools.Common.Test/*",

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,9 @@
 
 -->
 ## Upcoming Release
+* Added `ConsistencyMode` parameter to `New-AzRestorePoint`.
+* Updated the storage account type value in several locations from the outdated `StandardLRS` to the current `Standard_LRS`.
+* Filled in missing parameter descriptions across multiple parameters and improved some existing parameter descriptions.
 * Added `ConsistencyMode` parameter to `New-AzRestorePoint`
 * Updated Compute PS to use the new .Net SDK version 59.0.0. This includes an approved breaking change for a non-functional feature. 
   - The type of the property `Source` of type `Microsoft.Azure.Management.Compute.Models.GalleryDataDiskImage`, `Microsoft.Azure.Management.Compute.Models.GalleryOSDiskImage`, and `Microsoft.Azure.Management.Compute.Models.GalleryImageVersionStorageProfile` has changed from `Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource` to `Microsoft.Azure.Management.Compute.Models.GalleryDiskImageSource`.

src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskUpdateConfigCommand.cs

@@ -68,13 +68,15 @@ public partial class NewAzureRmDiskUpdateConfigCommand : Microsoft.Azure.Command
 
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true)]
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Policy for accessing the disk via network. Available values are: AllowAll, AllowPrivate, DeyAll")]
         [PSArgumentCompleter("AllowAll", "AllowPrivate", "DenyAll")]
         public string NetworkAccessPolicy { get; set; }
 
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true)]
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "ARM id of the DiskAccess resource for using private endpoints on disks")]
         public string DiskAccessId { get; set; }
 
         [Parameter(
@@ -108,18 +110,19 @@ public partial class NewAzureRmDiskUpdateConfigCommand : Microsoft.Azure.Command
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Sets the Purchase Plan for the Disk")]
+            HelpMessage = "Sets the purchase plan for the disk. Used for establishing the purchase context of any 3rd Party artifact through Marketplace.")]
         public PSPurchasePlan PurchasePlan { get; set; }
 
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Specify if Disk Supports Hibernation with $true of $false")]
+            HelpMessage = "Indicates if the OS on the disk supports hibernation with $true or $false")]
         public bool? SupportsHibernation { get; set; }
 
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true)]
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Enable encryption settings on the disk")]
         public bool? EncryptionSettingsEnabled { get; set; }
 
         [Parameter(
@@ -138,7 +141,8 @@ public partial class NewAzureRmDiskUpdateConfigCommand : Microsoft.Azure.Command
 
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true)]
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The type of key used to encrypt the data of the disk. Available values are: EncryptionAtRestWithPlatformKey, EncryptionAtRestWithCustomerKey")]
         [PSArgumentCompleter("EncryptionAtRestWithPlatformKey", "EncryptionAtRestWithCustomerKey")]
 
         public string EncryptionType { get; set; }

src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs

@@ -129,7 +129,7 @@ public override void ExecuteCmdlet()
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Gets or sets set this flag to true to enable auto-updating of this disk encryption")]
+            HelpMessage = "Set this flag to true to enable auto-updating of this disk encryption set to the latest key version")]
         public bool? RotationToLatestKeyVersionEnabled { get; set; }
 
         [Parameter(

src/Compute/Compute/Generated/Snapshot/Config/NewAzureRmSnapshotConfigCommand.cs

@@ -88,7 +88,6 @@ public partial class NewAzureRmSnapshotConfigCommand : Microsoft.Azure.Commands.
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Specifies whether this cmdlet creates a disk in the virtual machine from a platform or user image, creates an empty disk, or attaches an existing disk. Possible values are: Empty, Attach, FromImage, Import, Copy, Restore, Upload, CopyStart")]
-        //todo: verify help message with API team
         public string CreateOption { get; set; }
 
         [Parameter(
@@ -99,13 +98,13 @@ public partial class NewAzureRmSnapshotConfigCommand : Microsoft.Azure.Commands.
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Sets the Purchase Plan for the Snapshot.")]
+            HelpMessage = "Sets the purchase plan for the snapshot. Used for establishing the purchase context of any 3rd Party artifact through Marketplace.")]
         public PSPurchasePlan PurchasePlan { get; set; }
 
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Specify if Disk Supports Hibernation with $true of $false")]
+            HelpMessage = "Indicates if the OS on the snapshot supports hibernation with $true or $false")]
         public bool? SupportsHibernation { get; set; }
 
         [Parameter(

src/Compute/Compute/Generated/Snapshot/Config/NewAzureRmSnapshotUpdateConfigCommand.cs

@@ -64,7 +64,7 @@ public partial class NewAzureRmSnapshotUpdateConfigCommand : Microsoft.Azure.Com
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Specify if Disk Supports Hibernation with $true of $false")]
+            HelpMessage = "Indicates if the OS on the snapshot supports hibernation with $true or $false")]
         public bool? SupportsHibernation { get; set; }
 
 

src/Compute/Compute/RestorePoints/NewAzRestorePoint.cs

@@ -34,48 +34,52 @@ public class NewAzureRestorePoint : ComputeAutomationBaseCmdlet
         [Parameter(
             Position = 0,
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true)]
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Resource group name this resource belongs to")]
         [ResourceGroupCompleter]
         public string ResourceGroupName { get; set; }
 
         [Parameter(
             Position = 1,
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true)]
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Name of the restore point collection this restore point is part of")]
         public string RestorePointCollectionName{ get; set; }
 
         [Parameter(
             Position = 1,
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true)]
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The name of the restore point")]
         [Alias("RestorePointName")]
         public string Name { get; set; }
 
         [Parameter(
             Position = 3,
             Mandatory = false,
             ValueFromPipelineByPropertyName = false,
-            HelpMessage = "Set the region of the Restore Point")]
+            HelpMessage = "Set the region of the restore point")]
         public string Location { get; set; }
 
 
         [Parameter(
             Mandatory = false,
             ValueFromPipeline = true,
-            HelpMessage = "ARM Id of the source Restore Point")]
+            HelpMessage = "ARM Id of the source restore point")]
         public string RestorePointId { get; set; }
 
 
         [Parameter(
             Mandatory = false,
-            ValueFromPipeline = true)]
+            ValueFromPipeline = true,
+            HelpMessage = "List of disk resource Id values that the customer wishes to exclude from the restore point. If no disks are specified, all disks will be included.")]
         public string[] DisksToExclude { get; set; }
 
 
         [Parameter(
             Mandatory = false,
             ValueFromPipeline = true,
-            HelpMessage = "ConsistencyMode of the RestorePoint. Can be specified in the input while creating a restore point. For now, only CrashConsistent is accepted as a valid input. Please refer to https://aka.ms/RestorePoints for more details.")]
+            HelpMessage = "ConsistencyMode of the restore point. Can be specified in the input while creating a restore point. For now, only CrashConsistent is accepted as a valid input. Please refer to https://aka.ms/RestorePoints for more details.")]
         [PSArgumentCompleter("CrashConsistent", "FileSystemConsistent", "ApplicationConsistent")]
         public string ConsistencyMode { get; set; }
 

src/Compute/Compute/help/Add-AzVmssDataDisk.md

@@ -28,7 +28,7 @@ The **Add-AzVmssDataDisk** cmdlet adds a data disk to the Virtual Machine Scale
 ### Example 1: Add a data disk
 ```powershell
 $vmss = New-AzVmssConfig -Location $Loc -SkuCapacity 2 -SkuName "Standard_A0" -UpgradePolicyMode "Automatic"
-$vmss = Add-AzVmssDataDisk -VirtualMachineScaleSet $vmss -Name 'DataDisk1' -Lun 0 -Caching 'ReadOnly' -CreateOption Empty -DiskSizeGB 10 -StorageAccountType StandardLRS
+$vmss = Add-AzVmssDataDisk -VirtualMachineScaleSet $vmss -Name 'DataDisk1' -Lun 0 -Caching 'ReadOnly' -CreateOption Empty -DiskSizeGB 10 -StorageAccountType Standard_LRS
 ```
 
 This command adds an empty data disk to the VMSS object.

src/Compute/Compute/help/New-AzDiskUpdateConfig.md

@@ -132,7 +132,7 @@ Accept wildcard characters: False
 ```
 
 ### -DiskAccessId
-{{ Fill DiskAccessId Description }}
+ARM id of the DiskAccess resource for using private endpoints on disks
 
 ```yaml
 Type: System.String
@@ -252,7 +252,7 @@ Accept wildcard characters: False
 ```
 
 ### -EncryptionSettingsEnabled
-Enable encryption settings.
+Enable encryption settings on the disk
 
 ```yaml
 Type: System.Nullable`1[System.Boolean]
@@ -267,7 +267,7 @@ Accept wildcard characters: False
 ```
 
 ### -EncryptionType
-The type of key used to encrypt the data of the disk.  Available values are: 'EncryptionAtRestWithPlatformKey', 'EncryptionAtRestWithCustomerKey'
+The type of key used to encrypt the data of the disk. Available values are: EncryptionAtRestWithPlatformKey, EncryptionAtRestWithCustomerKey
 
 ```yaml
 Type: System.String
@@ -312,7 +312,7 @@ Accept wildcard characters: False
 ```
 
 ### -NetworkAccessPolicy
-{{ Fill NetworkAccessPolicy Description }}
+Policy for accessing the disk via network. Available values are: AllowAll, AllowPrivate, DeyAll
 
 ```yaml
 Type: System.String
@@ -358,7 +358,7 @@ Accept wildcard characters: False
 ```
 
 ### -PurchasePlan
-{{ Fill PurchasePlan Description }}
+Sets the purchase plan for the disk. Used for establishing the purchase context of any 3rd Party artifact through Marketplace.
 
 ```yaml
 Type: Microsoft.Azure.Commands.Compute.Automation.Models.PSPurchasePlan
@@ -388,7 +388,7 @@ Accept wildcard characters: False
 ```
 
 ### -SupportsHibernation
-{{ Fill SupportsHibernation Description }}
+Indicates if the OS on the disk supports hibernation with $true or $false
 
 ```yaml
 Type: System.Nullable`1[System.Boolean]

src/Compute/Compute/help/New-AzRestorePoint.md

@@ -33,7 +33,7 @@ Creates a new Restore Point
 ## PARAMETERS
 
 ### -ConsistencyMode
-ConsistencyMode of the RestorePoint. Can be specified in the input while creating a restore point. For now, only CrashConsistent is accepted as a valid input. Please refer to https://aka.ms/RestorePoints for more details.
+ConsistencyMode of the restore point. Can be specified in the input while creating a restore point. For now, only CrashConsistent is accepted as a valid input. Please refer to https://aka.ms/RestorePoints for more details.
 
 ```yaml
 Type: System.String
@@ -63,7 +63,7 @@ Accept wildcard characters: False
 ```
 
 ### -DisksToExclude
-List of disk resource ids that the customer wishes to exclude from the restorepoint. If no disks are specified, all disks will be included.
+List of disk resource Id values that the customer wishes to exclude from the restore point. If no disks are specified, all disks will be included.
 
 ```yaml
 Type: System.String[]
@@ -78,7 +78,7 @@ Accept wildcard characters: False
 ```
 
 ### -Location
-{{ Fill Location Description }}
+Set the region of the restore point
 
 ```yaml
 Type: System.String
@@ -93,7 +93,7 @@ Accept wildcard characters: False
 ```
 
 ### -Name
-Resource Name
+The name of the restore point
 
 ```yaml
 Type: System.String
@@ -108,7 +108,7 @@ Accept wildcard characters: False
 ```
 
 ### -ResourceGroupName
-Resource Group Name
+Resource group name this resource belongs to
 
 ```yaml
 Type: System.String
@@ -123,7 +123,7 @@ Accept wildcard characters: False
 ```
 
 ### -RestorePointCollectionName
-Restore Point Collection Name
+Name of the restore point collection this restore point is part of
 
 ```yaml
 Type: System.String
@@ -138,7 +138,7 @@ Accept wildcard characters: False
 ```
 
 ### -RestorePointId
-{{ Fill RestorePointId Description }}
+ARM Id of the source restore point
 
 ```yaml
 Type: System.String

src/Compute/Compute/help/New-AzSnapshot.md

@@ -24,7 +24,7 @@ The **New-AzSnapshot** cmdlet creates a snapshot.
 
 ### Example 1
 ```powershell
-$snapshotconfig = New-AzSnapshotConfig -Location 'Central US' -DiskSizeGB 5 -AccountType StandardLRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
+$snapshotconfig = New-AzSnapshotConfig -Location 'Central US' -DiskSizeGB 5 -AccountType Standard_LRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
 $secretUrl = 'https://myvault.vault-int.azure-int.net/secrets/123/';
 $secretId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault123';
 $keyUrl = 'https://myvault.vault-int.azure-int.net/keys/456';

src/Compute/Compute/help/New-AzSnapshotConfig.md

@@ -362,7 +362,7 @@ Accept wildcard characters: False
 ```
 
 ### -PurchasePlan
-{{ Fill PurchasePlan Description }}
+Sets the purchase plan for the snapshot. Used for establishing the purchase context of any 3rd Party artifact through Marketplace.
 
 ```yaml
 Type: Microsoft.Azure.Commands.Compute.Automation.Models.PSPurchasePlan
@@ -437,7 +437,7 @@ Accept wildcard characters: False
 ```
 
 ### -SupportsHibernation
-{{ Fill SupportsHibernation Description }}
+Indicates if the OS on the snapshot supports hibernation with $true or $false
 
 ```yaml
 Type: System.Nullable`1[System.Boolean]

src/Compute/Compute/help/New-AzSnapshotUpdateConfig.md

@@ -251,7 +251,7 @@ Accept wildcard characters: False
 ```
 
 ### -SupportsHibernation
-{{ Fill SupportsHibernation Description }}
+Indicates if the OS on the snapshot supports hibernation with $true or $false
 
 ```yaml
 Type: System.Nullable`1[System.Boolean]

src/Compute/Compute/help/Set-AzDiskDiskEncryptionKey.md

@@ -24,7 +24,7 @@ The **Set-AzDiskDiskEncryptionKey** cmdlet sets the disk encryption key properti
 
 ### Example 1
 ```powershell
-$diskconfig = New-AzDiskConfig -Location 'Central US' -DiskSizeGB 5 -SkuName StandardLRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
+$diskconfig = New-AzDiskConfig -Location 'Central US' -DiskSizeGB 5 -SkuName Standard_LRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
 $secretUrl = 'https://myvault.vault-int.azure-int.net/secrets/123/';
 $secretId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault123';
 $keyUrl = 'https://myvault.vault-int.azure-int.net/keys/456';

src/Compute/Compute/help/Set-AzDiskKeyEncryptionKey.md

@@ -24,7 +24,7 @@ The **Set-AzDiskKeyEncryptionKey** cmdlet sets the key encryption key properties
 
 ### Example 1
 ```powershell
-$diskconfig = New-AzDiskConfig -Location 'Central US' -DiskSizeGB 5 -SkuName StandardLRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
+$diskconfig = New-AzDiskConfig -Location 'Central US' -DiskSizeGB 5 -SkuName Standard_LRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
 $secretUrl = 'https://myvault.vault-int.azure-int.net/secrets/123/';
 $secretId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault123';
 $keyUrl = 'https://myvault.vault-int.azure-int.net/keys/456';