Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Win2022 azure edition core alias #18331

Merged
merged 8 commits into from
Jun 23, 2022
+14 −6
Merged

Win2022 azure edition core alias #18331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c25643
Update Images.json
mgreenegit May 27, 2022
cbed9a1
Update New-AzVM.md
mgreenegit May 27, 2022
234a6a6
Update NewAzureVMCommand.cs
mgreenegit May 27, 2022
8a733ef
Update ChangeLog.md
mgreenegit May 27, 2022
ae53853
Update ChangeLog.md
mgreenegit Jun 1, 2022
0bb91ef
Update ChangeLog.md
VeryEarly Jun 15, 2022
a0da8cf
Merge branch 'main' into Win2022AzureEditionCore_alias
VeryEarly Jun 17, 2022
76e0fdf
Merge branch 'main' into Win2022AzureEditionCore_alias
VeryEarly Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Compute/Compute/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

-->
## Upcoming Release
* Added image alias 'Win2022AzureEditionCore'
* For `Add-AzVhd` upon upload failure using DirectUploadToManagedDisk parameter set, the SAS will be revoked and the created managed disk will be deleted.
* An unresolved path can be passed in for '-LocalFilePath' for `Add-AzVhd`. The cmdlet with unresolve the path itself.
* Added `-DataAccessAuthMode` parameter to Add-AzVhd DirectUploadToManagedDisk parameter set.
Expand Down
6 changes: 6 additions & 0 deletions src/Compute/Compute/Strategies/ComputeRp/Images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
}
},
"Windows": {
"Win2022AzureEditionCore": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2022-datacenter-azure-edition-core",
"version": "latest"
},
"Win2019Datacenter": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
Expand Down
7 changes: 4 additions & 3 deletions src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -1283,4 +1284,4 @@ private void validate()
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/Compute/Compute/help/New-AzVM.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down Expand Up @@ -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
```

Expand Down Expand Up @@ -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
Expand Down