Merge branch 'main' into lnx/revertcore

Author: Nickcandy

.github/policies/resourceManagement.yml

@@ -1764,7 +1764,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - idear1203
+            - MikeRys
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

documentation/breaking-changes/breaking-changes-attribute-help.md

@@ -60,6 +60,10 @@ Alternatively, set the env variable "SuppressAzurePowerShellBreakingChangeWarnin
 Set-Item Env:\SuppressAzurePowerShellBreakingChangeWarnings "true"
 ```
 
+This environment variable must be set before importing the **Az** or **Az.Accounts** PowerShell module for it to take effect in the current PowerShell session.
+
+For additional methods to disable breaking change warning messages in Azure PowerShell, see [Configure Azure PowerShell global settings](https://learn.microsoft.com/powershell/azure/configure-global-settings#breaking-change-warning-messages).
+
 NOTE :
 - The only time you will see the output (at runtime) of an attribute applied to a parameter (property or field) is if the parameter is actually invoked on the cmdline. The breaking change attributes to all parameters that are not invoked are ignored.
 

src/Compute/Compute/ChangeLog.md

@@ -22,6 +22,7 @@
 ## Upcoming Release
 * Added optional parameters `-SecurityPostureId` and `-SecurityPostureExcludeExtension` to cmdlets `New-AzVmss` and `New-AzVmssConfig`.
 * Updated image aliases to be up-to-date in the azure-powershell\src\Compute\Strategies\ComputeRp\Images.json file.
+* Added `NvmeDisk` argument completer to `DiffDiskPlacement` parameter for `Set-AzVMOSDisk` and `Set-AzVmssStorageProfile` cmdlets, allowing options for disk placement as `CacheDisk`, `ResourceDisk`, or `NvmeDisk`.
 
 ## Version 8.4.0
 * Added `SkuProfileVmSize` and `SkuProfileAllocationStrategy` parameters to `New-AzVmss`, `New-AzVmssConfig`, and `Update-AzVmss` cmdlets for VMSS Instance Mix operations.

src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/SetAzureRmVmssStorageProfileCommand.cs

@@ -130,8 +130,8 @@ public partial class SetAzureRmVmssStorageProfileCommand : Microsoft.Azure.Comma
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e. cache disk or resource disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer Ephemeral OS disk size requirements for Windows VM at https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VM at https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements. This parameter can only be used if the parameter DiffDiskSetting is set to 'Local'.")]
-        [PSArgumentCompleter("CacheDisk", "ResourceDisk")]
+            HelpMessage = "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e. cache disk, resource disk or Nvme disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer Ephemeral OS disk size requirements for Windows VM at https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VM at https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements. This parameter can only be used if the parameter DiffDiskSetting is set to 'Local'.")]
+        [PSArgumentCompleter("CacheDisk", "ResourceDisk", "NvmeDisk")]
         public string DiffDiskPlacement { get; set; }
 
         [Parameter(
@@ -678,4 +678,4 @@ private void Run()
             WriteObject(this.VirtualMachineScaleSet);
         }
     }
-}
+}

src/Compute/Compute/Manual/PSVirtualMachineScaleSet.cs

@@ -14,11 +14,6 @@
 // limitations under the License.
 // 
 
-// Warning: This code was generated by a tool.
-// 
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-
 namespace Microsoft.Azure.Commands.Compute.Automation.Models
 {
     public partial class PSVirtualMachineScaleSet

src/Compute/Compute/VirtualMachine/Config/SetAzureVMOSDiskCommand.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -181,8 +181,8 @@ public class SetAzureVMOSDiskCommand : ComputeClientBaseCmdlet
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e. cache disk or resource disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer Ephemeral OS disk size requirements for Windows VM at https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VM at https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements. This parameter can only be used if the parameter DiffDiskSetting is set to 'Local'.")]
-        [PSArgumentCompleter("CacheDisk", "ResourceDisk")]
+            HelpMessage = "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e. cache disk, resource disk or Nvme disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer Ephemeral OS disk size requirements for Windows VM at https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VM at https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements. This parameter can only be used if the parameter DiffDiskSetting is set to 'Local'.")]
+        [PSArgumentCompleter("CacheDisk", "ResourceDisk", "NvmeDisk")]
         public string DiffDiskPlacement { get; set; }
 
         [Parameter(
@@ -360,4 +360,4 @@ public override void ExecuteCmdlet()
             WriteObject(this.VM);
         }
     }
-}
+}

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

@@ -322,7 +322,7 @@ Accept wildcard characters: False
 ### -Feature
 
 A list of gallery image features.
-For SecurityType, acceptable inputs are: None, TrustedlaunchSupported, Trustedlaunch, ConfidentialVM, ConfidentialVMSupported, TrustedandConfidentialVMSupported
+For SecurityType, acceptable inputs are: None, TrustedlaunchSupported, Trustedlaunch, ConfidentialVM, ConfidentialVMSupported, TrustedLaunchAndConfidentialVmSupported
 
 ```yaml
 Type: Microsoft.Azure.Management.Compute.Models.GalleryImageFeature[]

src/EventHub/EventHub.Management.Sdk/EventHub.Management.Sdk.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <PsModuleName>EventHub</PsModuleName>
+    </PropertyGroup>
+    <Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <AssemblyName>Microsoft.Azure.PowerShell.EventHub.Management.Sdk</AssemblyName>
+        <RootNamespace>Microsoft.Azure.Management.EventHub</RootNamespace>
+        <NoWarn>$(NoWarn);CS0108;CS1573</NoWarn>
+    </PropertyGroup>
+    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
+</Project>