From 7c2564387f8f8a45a5d740bc5dac7b18a0306804 Mon Sep 17 00:00:00 2001 From: Michael Greene Date: Fri, 27 May 2022 15:17:31 -0500 Subject: [PATCH 1/6] Update Images.json --- src/Compute/Compute/Strategies/ComputeRp/Images.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Compute/Compute/Strategies/ComputeRp/Images.json b/src/Compute/Compute/Strategies/ComputeRp/Images.json index 87fc6f7779f7..930c00b4adb1 100644 --- a/src/Compute/Compute/Strategies/ComputeRp/Images.json +++ b/src/Compute/Compute/Strategies/ComputeRp/Images.json @@ -44,6 +44,12 @@ } }, "Windows": { + "Win2022AzureEditionCore": { + "publisher": "MicrosoftWindowsServer", + "offer": "WindowsServer", + "sku": "2022-datacenter-azure-edition-core", + "version": "latest" + }, "Win2019Datacenter": { "publisher": "MicrosoftWindowsServer", "offer": "WindowsServer", From cbed9a14e1aae32b1368d7f0ca746341fbdefea4 Mon Sep 17 00:00:00 2001 From: Michael Greene Date: Fri, 27 May 2022 15:25:34 -0500 Subject: [PATCH 2/6] Update New-AzVM.md --- src/Compute/Compute/help/New-AzVM.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Compute/Compute/help/New-AzVM.md b/src/Compute/Compute/help/New-AzVM.md index a47299220414..428806adb793 100644 --- a/src/Compute/Compute/help/New-AzVM.md +++ b/src/Compute/Compute/help/New-AzVM.md @@ -171,7 +171,7 @@ $Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdmi $VirtualMachine = New-AzVMConfig -VMName $VMName -VMSize $VMSize $VirtualMachine = Set-AzVMOperatingSystem -VM $VirtualMachine -Windows -ComputerName $ComputerName -Credential $Credential -ProvisionVMAgent -EnableAutoUpdate $VirtualMachine = Add-AzVMNetworkInterface -VM $VirtualMachine -Id $NIC.Id -$VirtualMachine = Set-AzVMSourceImage -VM $VirtualMachine -PublisherName 'MicrosoftWindowsServer' -Offer 'WindowsServer' -Skus '2012-R2-Datacenter' -Version latest +$VirtualMachine = Set-AzVMSourceImage -VM $VirtualMachine -PublisherName 'MicrosoftWindowsServer' -Offer 'WindowsServer' -Skus '2022-datacenter-azure-edition-core' -Version latest New-AzVM -ResourceGroupName $ResourceGroupName -Location $LocationName -VM $VirtualMachine -Verbose ``` @@ -218,7 +218,7 @@ $NIC = New-AzNetworkInterface -Name NICname -ResourceGroupName ResourceGroup2 -L $VirtualMachine = New-AzVMConfig -VMName VirtualMachineName -VMSize Standard_D4s_v3 $VirtualMachine = Set-AzVMOperatingSystem -VM $VirtualMachine -Windows -ComputerName computerName -Credential $psCred -ProvisionVMAgent -EnableAutoUpdate $VirtualMachine = Add-AzVMNetworkInterface -VM $VirtualMachine -Id $NIC.Id -$VirtualMachine = Set-AzVMSourceImage -VM $VirtualMachine -PublisherName 'MicrosoftWindowsServer' -Offer 'WindowsServer' -Skus '2012-R2-Datacenter' -Version latest +$VirtualMachine = Set-AzVMSourceImage -VM $VirtualMachine -PublisherName 'MicrosoftWindowsServer' -Offer 'WindowsServer' -Skus '2022-datacenter-azure-edition-core' -Version latest New-AzVm -ResourceGroupName ResourceGroup1 -Location SouthCentralUS -VM $VirtualMachine ``` @@ -547,7 +547,7 @@ Accept wildcard characters: False ``` ### -Image -The friendly image name upon which the VM will be built. These include: Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, Win2008R2SP1, UbuntuLTS, CentOS, CoreOS, Debian, openSUSE-Leap, RHEL, SLES. +The friendly image name upon which the VM will be built. These include: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, Win2008R2SP1, UbuntuLTS, CentOS, CoreOS, Debian, openSUSE-Leap, RHEL, SLES. ```yaml Type: System.String From 234a6a65bc3b4bdef1e35f092e79b12863b56a20 Mon Sep 17 00:00:00 2001 From: Michael Greene Date: Fri, 27 May 2022 15:27:53 -0500 Subject: [PATCH 3/6] Update NewAzureVMCommand.cs --- .../Compute/VirtualMachine/Operation/NewAzureVMCommand.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs b/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs index 77c2ccc01717..dd2e922e3857 100644 --- a/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs +++ b/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs @@ -203,12 +203,13 @@ public class NewAzureVMCommand : VirtualMachineBaseCmdlet "RHEL", "SLES", "UbuntuLTS", + "Win2022AzureEditionCore", + "Win2019Datacenter", "Win2016Datacenter", "Win2012R2Datacenter", "Win2012Datacenter", "Win2008R2SP1", - "Win10", - "Win2019Datacenter")] + "Win10")] [Alias("ImageName")] public string Image { get; set; } = "Win2016Datacenter"; @@ -1283,4 +1284,4 @@ private void validate() } } } -} \ No newline at end of file +} From 8a733ef2cd5bda722f078828c924d8762ad765e4 Mon Sep 17 00:00:00 2001 From: Michael Greene Date: Fri, 27 May 2022 15:31:59 -0500 Subject: [PATCH 4/6] Update ChangeLog.md --- src/Compute/Compute/ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md index 18fc53893c27..5a7d577e6b90 100644 --- a/src/Compute/Compute/ChangeLog.md +++ b/src/Compute/Compute/ChangeLog.md @@ -38,6 +38,7 @@ * Added `-InstanceView` parameter to `Get-AzRestorePoint` * Added parameter `-ScriptString` to `Invoke-AzvmRunCommand` and `Invoke-AzvmssRunCommand` * Added parameter `-ScaleInPolicyForceDeletion` to `Update-Azvmss` +* Added image alias 'Win2022AzureEditionCore' ## Version 4.26.0 * Added `-ImageReferenceId` parameter to following cmdlets: `New-AzVm`, `New-AzVmConfig`, `New-AzVmss`, `Set-AzVmssStorageProfile` From ae53853e0f12067a5337be653c8afe04cd3dc780 Mon Sep 17 00:00:00 2001 From: Michael Greene Date: Wed, 1 Jun 2022 08:40:08 -0500 Subject: [PATCH 5/6] Update ChangeLog.md --- src/Compute/Compute/ChangeLog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md index 5a7d577e6b90..72ddef4a9d64 100644 --- a/src/Compute/Compute/ChangeLog.md +++ b/src/Compute/Compute/ChangeLog.md @@ -20,7 +20,8 @@ --> ## Upcoming Release - +* Added image alias 'Win2022AzureEditionCore' +* ## Version 4.27.0 * Edited `New-AzVm` cmdlet internal logic to use the `PlatformFaultDomain` value in the `PSVirtualMachine` object passed to it in the new virtual machine. * Added a new cmdlet named `Restart-AzHost` to restart dedicated hosts. @@ -38,7 +39,6 @@ * Added `-InstanceView` parameter to `Get-AzRestorePoint` * Added parameter `-ScriptString` to `Invoke-AzvmRunCommand` and `Invoke-AzvmssRunCommand` * Added parameter `-ScaleInPolicyForceDeletion` to `Update-Azvmss` -* Added image alias 'Win2022AzureEditionCore' ## Version 4.26.0 * Added `-ImageReferenceId` parameter to following cmdlets: `New-AzVm`, `New-AzVmConfig`, `New-AzVmss`, `Set-AzVmssStorageProfile` From 0bb91ef976f94a6c42db527d20f94d943fd171b1 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Wed, 15 Jun 2022 17:16:34 +0800 Subject: [PATCH 6/6] Update ChangeLog.md --- src/Compute/Compute/ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md index 72ddef4a9d64..d7f7398c2b29 100644 --- a/src/Compute/Compute/ChangeLog.md +++ b/src/Compute/Compute/ChangeLog.md @@ -21,7 +21,7 @@ --> ## Upcoming Release * Added image alias 'Win2022AzureEditionCore' -* + ## Version 4.27.0 * Edited `New-AzVm` cmdlet internal logic to use the `PlatformFaultDomain` value in the `PSVirtualMachine` object passed to it in the new virtual machine. * Added a new cmdlet named `Restart-AzHost` to restart dedicated hosts.