Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 4e2b3fc

Browse files
Update default windows image for windows 11 (#3374)
* Update all win10 image references to win11 as default
1 parent 98e986e commit 4e2b3fc

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

docs/supported-platforms.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ OneFuzz is cross-platform, and the actively-supported platforms vary by componen
44

55
### CLI
66

7-
We continuously test the CLI on Windows 10 Pro and Ubuntu 20.04 LTS, both on the
8-
x64 architecture. The CLI client is written in Python 3, and targets Python 3.7
9-
and up. We distribute a self-contained executable CLI build for Windows which
7+
We continuously test the CLI on Windows 11 Pro and Ubuntu 20.04 LTS, both on the
8+
x64 architecture. The CLI client is written in Python 3, and targets Python 3.7
9+
and up. We distribute a self-contained executable CLI build for Windows which
1010
bundles a Python interpreter.
1111

1212
### Virtual Machine Scale Sets
1313

1414
OneFuzz deploys targets into Azure Virtual Machine Scale Sets for fuzzing (and
15-
supporting tasks). OneFuzz permits arbitrary choice of VM SKU and OS Image,
16-
including custom images. We continuously test on Window 10 Pro x64 (using the
17-
Azure OS image URN `MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest`)
18-
and Ubuntu 20.04 LTS x64 (using the Azure OS image URN
15+
supporting tasks). OneFuzz permits arbitrary choice of VM SKU and OS Image,
16+
including custom images. We continuously test on Window 11 Pro x64 (using the
17+
Azure OS image URN `MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest`)
18+
and Ubuntu 20.04 LTS x64 (using the Azure OS image URN
1919
`Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest`).
2020

2121
### LibFuzzer Compilation

docs/webhook_events.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ If webhook is set to have Event Grid message format then the payload will look a
721721
"00000000-0000-0000-0000-000000000000"
722722
],
723723
"default_linux_vm_image": "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
724-
"default_windows_vm_image": "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest",
724+
"default_windows_vm_image": "MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest",
725725
"network_config": {
726726
"address_space": "10.0.0.0/8",
727727
"subnet": "10.0.0.0/16"
@@ -868,7 +868,7 @@ If webhook is set to have Event Grid message format then the payload will look a
868868
"type": "string"
869869
},
870870
"default_windows_vm_image": {
871-
"default": "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest",
871+
"default": "MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest",
872872
"title": "Default Windows Vm Image",
873873
"type": "string"
874874
},
@@ -6181,7 +6181,7 @@ If webhook is set to have Event Grid message format then the payload will look a
61816181
"type": "string"
61826182
},
61836183
"default_windows_vm_image": {
6184-
"default": "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest",
6184+
"default": "MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest",
61856185
"title": "Default Windows Vm Image",
61866186
"type": "string"
61876187
},

src/ApiService/ApiService/onefuzzlib/ImageReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Microsoft.OneFuzz.Service;
1414

1515
public static class DefaultImages {
16-
public static readonly ImageReference Windows = ImageReference.MustParse("MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest");
16+
public static readonly ImageReference Windows = ImageReference.MustParse("MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest");
1717
public static readonly ImageReference Linux = ImageReference.MustParse("Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest");
1818
}
1919

src/pytypes/onefuzztypes/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ class InstanceConfig(BaseModel):
837837
)
838838
extensions: Optional[AzureVmExtensionConfig]
839839
default_windows_vm_image: str = Field(
840-
default="MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest"
840+
default="MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest"
841841
)
842842
default_linux_vm_image: str = Field(
843843
default="Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest"

src/runtime-tools/win64/onefuzz.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ function Install-Debugger {
139139

140140
# Windows PowerShell reports progress on every byte downloaded causing performance issues.
141141
$ProgressPreference = 'SilentlyContinue'
142-
Invoke-WebRequest -Uri 'https://download.microsoft.com/download/4/2/2/42245968-6A79-4DA7-A5FB-08C0AD0AE661/windowssdk/winsdksetup.exe' -OutFile debug-setup.exe
142+
Invoke-WebRequest -Uri 'https://download.microsoft.com/download/b/8/5/b85bd06f-491c-4c1c-923e-75ce2fe2378e/windowssdk/winsdksetup.exe' -OutFile debug-setup.exe
143143
Start-Process "./debug-setup.exe" -ArgumentList "/norestart /quiet /features OptionId.WindowsDesktopDebuggers /log dbg-install.log" -Wait
144144

145145
# New-NetFirewallRule -Name onefuzzdebug -DisplayName 'CDB listener' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 1337

0 commit comments

Comments
 (0)