Merge pull request #3668 from MicrosoftDocs/main638841529560464427sync_temp

learn-build-service-prod[bot] · web-flow · commit 80b9efc9e7e0 · 2025-05-29T22:02:58.000Z
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
diff --git a/AKS-Arc/aks-edge-howto-secret-encryption.md b/AKS-Arc/aks-edge-howto-secret-encryption.md
@@ -92,7 +92,7 @@ If there are errors with the KMS plugin, follow this procedure:
    Repair-AksEdgeKms
    ```
 
-1. If you still encounter errors, contact [Microsoft Customer Support](aks-edge-troubleshoot-overview.md) and [collect logs](aks-get-kubelet-logs.md).
+1. If you still encounter errors, contact [Microsoft Customer Support](aks-edge-troubleshoot-overview.md) and [collect logs](aks-edge-resources-logs.md).
 
 ## Next steps
 
diff --git a/azure-local/deploy/sdn-express-23h2.md b/azure-local/deploy/sdn-express-23h2.md
@@ -3,7 +3,7 @@ title: Deploy an SDN infrastructure using SDN Express for Azure Local, version 2
 description: Learn to deploy an SDN infrastructure using SDN Express for Azure Local, version 23h2.
 author: alkohli 
 ms.topic: how-to 
-ms.date: 04/22/2025
+ms.date: 05/29/2025
 ms.author: alkohli 
 ms.reviewer: anirbanpaul 
 ---
@@ -45,7 +45,7 @@ The following requirements must be met for a successful SDN deployment:
 
 ## Download the VHDX file
 
-[!INCLUDE [download-vhdx](../includes/hci-download-vhdx.md)]
+[!INCLUDE [download-vhdx](../includes/hci-download-vhdx-2.md)]
 
 ## Install the SDN Express PowerShell module
 
diff --git a/azure-local/deploy/sdn-wizard-23h2.md b/azure-local/deploy/sdn-wizard-23h2.md
@@ -3,7 +3,7 @@ title: Deploy SDN using Windows Admin Center for Azure Local
 description: Learn how to deploy an SDN infrastructure using Windows Admin Center for Azure Local
 author: alkohli
 ms.topic: how-to
-ms.date: 02/20/2025
+ms.date: 05/29/2025
 ms.author: alkohli
 ms.reviewer: anirbanpaul
 ---
@@ -49,7 +49,7 @@ The following requirements must be met for a successful SDN deployment:
 
 ## Download the VHDX file
 
-[!INCLUDE [download-vhdx](../includes/hci-download-vhdx.md)]
+[!INCLUDE [download-vhdx](../includes/hci-download-vhdx-2.md)]
 
 ## Deploy SDN Network Controller
 
diff --git a/azure-local/faq.yml b/azure-local/faq.yml
@@ -129,5 +129,11 @@ sections:
       
       - question: How long is Azure Local, version 22H2 supported?
         answer: |
-            Azure Stack HCI, version 22H2 will reach end of support on May 31, 2025. After this date, you won't receive monthly security and quality updates. Support requests (SR) will only be available when performing an operating system upgrade. To continue receiving updates, we recommend that you upgrade your operating system to [version 23H2](./upgrade/upgrade-22h2-to-23h2-powershell.md).
-            If you're currently running an Azure Local, version 22H2 stretch cluster or managing Azure Local via System Center - Virtual Machine Manager, review the [Supported workloads and configurations](./upgrade/about-upgrades-23h2.md#supported-workloads-and-configurations) table for update timelines.
+            Azure Stack HCI, version 22H2 will reach end of support on May 31, 2025. After this date:
+            - Monthly security and quality updates stop.
+            - Billing continues for version 22H2 systems.
+            - Your system keeps working, including registration and repair.
+            - Microsoft Support remains available only for upgrade assistance.
+
+            To stay supported and continue receiving updates, we recommend upgrading your operating system to [version 23H2](./upgrade/upgrade-22h2-to-23h2-powershell.md).
+            If you're running an Azure Stack HCI, version 22H2 stretch cluster or managing Azure Local via System Center - Virtual Machine Manager, review the [Supported workloads and configurations](./upgrade/about-upgrades-23h2.md#supported-workloads-and-configurations) table for update timelines.
diff --git a/azure-local/includes/end-of-service-22h2.md b/azure-local/includes/end-of-service-22h2.md
@@ -3,11 +3,16 @@ author: alkohli
 ms.author: alkohli
 ms.service: azure-local
 ms.topic: include
-ms.date: 02/03/2025
+ms.date: 05/29/2025
 ms.reviewer: alkohli
 ---
 
 >[!IMPORTANT]
-> Azure Stack HCI, version 22H2 will reach end of support on May 31, 2025. After this date, you won't receive monthly security and quality updates. Support requests (SR) will only be available when performing an operating system upgrade. To continue receiving updates, we recommend that you upgrade your operating system to [version 23H2](../upgrade/upgrade-22h2-to-23h2-powershell.md).
+> Azure Stack HCI, version 22H2 will reach end of support on May 31, 2025. After this date:
+> - Monthly security and quality updates stop.
+> - Billing continues for version 22H2 systems.
+> - Your system keeps working, including registration and repair.
+> - Microsoft Support remains available only for upgrade assistance.
 >
->If you're currently running an Azure Stack HCI, version 22H2 stretch cluster or managing Azure Local via System Center - Virtual Machine Manager, review the [Supported workloads and configurations](../upgrade/about-upgrades-23h2.md#supported-workloads-and-configurations) table for update timelines.
+> To stay supported and continue receiving updates, we recommend upgrading your operating system to [version 23H2](../upgrade/upgrade-22h2-to-23h2-powershell.md).
+>If you're running an Azure Stack HCI, version 22H2 stretch cluster or managing Azure Local via System Center - Virtual Machine Manager, review the [Supported workloads and configurations](../upgrade/about-upgrades-23h2.md#supported-workloads-and-configurations) table for update timelines.
diff --git a/azure-local/includes/hci-download-vhdx-2.md b/azure-local/includes/hci-download-vhdx-2.md
@@ -0,0 +1,28 @@
+---
+author: alkohli
+ms.author: alkohli
+ms.service: azure-local
+ms.topic: include
+ms.date: 05/29/2025
+---
+
+SDN uses a VHDX file containing either the Azure Stack HCI or Windows Server operating system (OS) as a source for creating the SDN virtual machines (VMs).
+
+> [!NOTE]
+> The version of the OS in your VHDX must match the version used by the Azure Local Hyper-V machines. This VHDX file is used by all SDN infrastructure components.
+
+[Download an English-language version of the VHDX file](https://aka.ms/PVvxVBVCVVC).
+
+Currently, a non-English VHDX file isn't available for download. If you require a non-English version, [download the corresponding ISO file](../deploy/download-23h2-software.md) and convert it to VHDX using the `Convert-WindowsImage` cmdlet. You must run this script from a Windows client computer. You'll probably need to run this script as Administrator and modify the execution policy for scripts using the `Set-ExecutionPolicy` command.
+
+The following syntax shows an example of using `Convert-WindowsImage`:
+
+```powershell
+Install-Module -Name Convert-WindowsImage
+Import-Module Convert-WindowsImage
+
+$wimpath = "E:\sources\install.wim"
+$vhdpath = "D:\temp\AzureStackHCI.vhdx"
+$edition=1
+Convert-WindowsImage -SourcePath $wimpath -Edition $edition -VHDPath $vhdpath -SizeBytes 500GB -DiskLayout UEFI
+```
diff --git a/azure-local/release-information-23h2.md b/azure-local/release-information-23h2.md
@@ -106,8 +106,8 @@ Starting with Azure Local 2503, you can discover and import update packages for
 
 |Version| OS Build |Security update| What's new | Known issues |
 |------|-------|---------------|------------|--------------|
-| 12.2505.1001.23 <br><br> Availability date: 2025-05-28 | 26100.4061 | [May OS security update](security-update/security-update.md?view=azloc-2505&preserve-view=true) | [Features and improvements](./whats-new.md?view=azloc-2505&preserve-view=true#features-and-improvements-in-2505) | [Known issues](./known-issues.md?view=azloc-2505&preserve-view=true) |
-| 12.2504.1001.20 <br><br> Availability date: 2025-04-29 | 26100.3775 | [April OS security update](security-update/security-update.md?view=azloc-2504&preserve-view=true) | [Features and improvements](./whats-new.md?view=azloc-2504&preserve-view=true#features-and-improvements-in-2504) | [Known issues](./known-issues.md?view=azloc-2504&preserve-view=true) |
+| 12.2505.1001.23 <br><br> Availability date: 2025-05-28 | 26100.4061 | [May OS security update](security-update/security-update.md?view=azloc-2505&preserve-view=true&tabs=new-deployments) | [Features and improvements](./whats-new.md?view=azloc-2505&preserve-view=true#features-and-improvements-in-2505) | [Known issues](./known-issues.md?view=azloc-2505&preserve-view=true) |
+| 12.2504.1001.20 <br><br> Availability date: 2025-04-29 | 26100.3775 | [April OS security update](security-update/security-update.md?view=azloc-2504&preserve-view=true&tabs=new-deployments) | [Features and improvements](./whats-new.md?view=azloc-2504&preserve-view=true#features-and-improvements-in-2504) | [Known issues](./known-issues.md?view=azloc-2504&preserve-view=true) |
 
 ---
 
