Update default windows image for windows 11 (#3374)

* Update all win10 image references to win11 as default
microsoft · Aug 17, 2023 · 4e2b3fc · 4e2b3fc
1 parent 98e986e
commit 4e2b3fc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
@@ -4,18 +4,18 @@ OneFuzz is cross-platform, and the actively-supported platforms vary by componen
 
 ### CLI
 
-We continuously test the CLI on Windows 10 Pro and Ubuntu 20.04 LTS, both on the
-x64 architecture.  The CLI client is written in Python 3, and targets Python 3.7
-and up.  We distribute a self-contained executable CLI build for Windows which 
+We continuously test the CLI on Windows 11 Pro and Ubuntu 20.04 LTS, both on the
+x64 architecture. The CLI client is written in Python 3, and targets Python 3.7
+and up. We distribute a self-contained executable CLI build for Windows which
 bundles a Python interpreter.
 
 ### Virtual Machine Scale Sets
 
 OneFuzz deploys targets into Azure Virtual Machine Scale Sets for fuzzing (and
-supporting tasks).  OneFuzz permits arbitrary choice of VM SKU and OS Image,
-including custom images.  We continuously test on Window 10 Pro x64 (using the 
-Azure OS image URN `MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest`)
-and Ubuntu 20.04 LTS x64 (using the Azure OS image URN 
+supporting tasks). OneFuzz permits arbitrary choice of VM SKU and OS Image,
+including custom images. We continuously test on Window 11 Pro x64 (using the
+Azure OS image URN `MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest`)
+and Ubuntu 20.04 LTS x64 (using the Azure OS image URN
 `Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest`).
 
 ### LibFuzzer Compilation

diff --git a/docs/webhook_events.md b/docs/webhook_events.md
@@ -721,7 +721,7 @@ If webhook is set to have Event Grid message format then the payload will look a
             "00000000-0000-0000-0000-000000000000"
         ],
         "default_linux_vm_image": "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
-        "default_windows_vm_image": "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest",
+        "default_windows_vm_image": "MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest",
         "network_config": {
             "address_space": "10.0.0.0/8",
             "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
                     "type": "string"
                 },
                 "default_windows_vm_image": {
-                    "default": "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest",
+                    "default": "MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest",
                     "title": "Default Windows Vm Image",
                     "type": "string"
                 },
@@ -6181,7 +6181,7 @@ If webhook is set to have Event Grid message format then the payload will look a
                     "type": "string"
                 },
                 "default_windows_vm_image": {
-                    "default": "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest",
+                    "default": "MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest",
                     "title": "Default Windows Vm Image",
                     "type": "string"
                 },

diff --git a/src/ApiService/ApiService/onefuzzlib/ImageReference.cs b/src/ApiService/ApiService/onefuzzlib/ImageReference.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.OneFuzz.Service;
 
 public static class DefaultImages {
-    public static readonly ImageReference Windows = ImageReference.MustParse("MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest");
+    public static readonly ImageReference Windows = ImageReference.MustParse("MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest");
     public static readonly ImageReference Linux = ImageReference.MustParse("Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest");
 }
 

diff --git a/src/pytypes/onefuzztypes/models.py b/src/pytypes/onefuzztypes/models.py
@@ -837,7 +837,7 @@ class InstanceConfig(BaseModel):
     )
     extensions: Optional[AzureVmExtensionConfig]
     default_windows_vm_image: str = Field(
-        default="MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest"
+        default="MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest"
     )
     default_linux_vm_image: str = Field(
         default="Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest"

diff --git a/src/runtime-tools/win64/onefuzz.ps1 b/src/runtime-tools/win64/onefuzz.ps1
@@ -139,7 +139,7 @@ function Install-Debugger {
 
   # Windows PowerShell reports progress on every byte downloaded causing performance issues.
   $ProgressPreference = 'SilentlyContinue'
-  Invoke-WebRequest -Uri 'https://download.microsoft.com/download/4/2/2/42245968-6A79-4DA7-A5FB-08C0AD0AE661/windowssdk/winsdksetup.exe' -OutFile debug-setup.exe
+  Invoke-WebRequest -Uri 'https://download.microsoft.com/download/b/8/5/b85bd06f-491c-4c1c-923e-75ce2fe2378e/windowssdk/winsdksetup.exe' -OutFile debug-setup.exe
   Start-Process "./debug-setup.exe" -ArgumentList "/norestart /quiet /features OptionId.WindowsDesktopDebuggers /log dbg-install.log" -Wait
 
   # New-NetFirewallRule -Name onefuzzdebug -DisplayName 'CDB listener' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 1337