Sync release-hotfixes with main

Sync release-hotfixes with main

Author: sethmanheim

azure-local/deploy/deployment-arc-register-configurator-app.md

@@ -4,7 +4,7 @@ description: Learn how to use the Configurator app to bootstrap and quickly regi
 author: alkohli
 ms.author: alkohli
 ms.topic: how-to
-ms.date: 05/23/2025
+ms.date: 05/22/2025
 ms.service: azure-local
 #CustomerIntent: As an IT Pro, I want to bootstrap and Arc register Azure Local machines via the Arc registration script.
 ---
@@ -28,6 +28,7 @@ Before you begin, make sure that you complete the following prerequisites:
 [!INCLUDE [hci-registration-azure-local-machine-prerequisites](../includes/hci-registration-azure-local-machine-prerequisites.md)]
 
 - Download the [Configurator App for Azure Local](https://aka.ms/ConfiguratorAppForHCI).
+
 - Note down:
 
    - The serial number for each machine.
@@ -150,7 +151,7 @@ Follow these steps to configure network settings and connect the machines to Azu
 
 1. On the resource group used to bootstrap, you should see your Arc-enabled machines. In this example, you see a single machine.
 
-   :::image type="content" source="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png" alt-text="Screenshot that shows the Azure Arc agent Arc-enabled servers in Azure portal for Azure Local." lightbox="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png":::
+   :::image type="content" source="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png" alt-text="Screenshot that shows the Azure Arc agent Arc-enabled servers in Azure portal for Azure Local ." lightbox="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png":::
 
 ## Troubleshooting
 
@@ -193,43 +194,56 @@ Here's a table that describes the diagnostic tests:
 
 ### Collect a Support log package from the app
 
-A Support log package is composed of all the relevant logs that can help Microsoft Support troubleshoot any machine issues. You can generate a Support package via the app.
+A Support package is composed of all the relevant logs that can help Microsoft Support troubleshoot any machine issues. You can generate a Support package via the app.
 
 #### Download the Support log package
 
-Follow these steps to collect and download a Support log package:
+Follow these steps to collect and download a Support package:
 
 1. Select the help icon in the top-right corner of the app to open the **Support + troubleshooting** pane. Select **Create** to begin support package collection. The package collection could take several minutes.
 
    :::image type="content" source="media/deployment-arc-register-configurator-app/collect-support-package-1.png" alt-text="Screenshot that shows the Support and troubleshooting pane with Create selected." lightbox="media/deployment-arc-register-configurator-app/collect-support-package-1.png":::
 
 1. After the Support package is created, select **Download**. This action downloads two zipped packages corresponding to Support logs and Configurator logs on your local system. You can unzip the package and view the system log files.
 
-#### Upload the Support log package
-
-> [!IMPORTANT]
-> - Make sure to run the Configurator app as an administrator to upload the Support log package.
-> - Uploading the Support log package to Microsoft can take up to 20 minutes. Make sure to leave the app open and running to complete this process.
+<!--#### Upload the Support log package
 
-Collect a Support log package before you upload it. Follow these steps to upload the Support log package to Microsoft:
+>[!IMPORTANT]
+> Uploading the Support package to Microsoft can take up to 20 minutes. Make sure to leave the app open and running to complete this process.
 
+Follow these steps to upload the Support package to Microsoft:
 1. Select the help icon in the top-right corner of the app to open the **Support + troubleshooting** pane. Select **Upload** to upload the Support package to Microsoft.
 
    :::image type="content" source="media/deployment-arc-register-configurator-app/upload-support-package-1.png" alt-text="Screenshot that shows the Support and troubleshooting pane with Upload package selected." lightbox="media/deployment-arc-register-configurator-app/upload-support-package-1.png":::
 
-1. Provide the required information in the **Upload Support package to Microsoft** dialog:
+1. Provide the required information in the **Upload Support package** dialog:
 
    :::image type="content" source="media/deployment-arc-register-configurator-app/upload-support-package-2.png" alt-text="Screenshot that shows the Upload Support Package dialog filled out." lightbox="media/deployment-arc-register-configurator-app/upload-support-package-2.png":::
 
-   The fields in the dialog are prepopulated with the information you provided during [Step 1: Configure the network and connect to Azure](#step-1-configure-the-network-and-connect-to-azure). You can modify the fields as needed.
+    1. The **Cloud type** is populated automatically as `Azure`.
+   
+    1. Enter a **Subscription ID** to register the machine.
+
+    1. Provide a **Resource group** name. This resource group contains the machine and system resources that you create.
+
+    1. Specify the **Region** where you want to create the resources. The region should be the same as the region where you want to deploy the Azure Local instance.
+
+       > [!IMPORTANT]
+       > Specify the region with spaces removed. For example, specify the East US region as `EastUS`.
+
+    1. Provide a **Tenant ID**. The tenant ID is the directory ID of your Microsoft Entra tenant. To get the tenant ID, see [Find your Microsoft Entra tenant](/azure/azure-portal/get-subscription-tenant-id).
+
+    1. If you set up an Azure Arc gateway, specify the Arc gateway ID. This is the resource ID of the Arc gateway that you set up. For more information, see [About Azure Arc gateways](./deployment-azure-arc-gateway-overview.md).
 
+       > [!IMPORTANT]
+       > Make sure to verify all the inputs before you proceed. Any incorrect inputs here might result in an upload failure.
 
-   1. Select **Begin upload** to upload the Support package.
-   1. Authenticate in the browser with the same account that you used to sign in to register with Azure Arc. The upload process might take several minutes. Leave the app open and running until the upload is complete.
+   1. Select **Upload** to upload the Support package.
+   1. Authenticate in the browser with the same account that you used to sign in to the Configurator app. The upload process might take several minutes.
 
        :::image type="content" source="media/deployment-arc-register-configurator-app/upload-support-package-3.png" alt-text="Screenshot that shows the Support and troubleshooting pane with Upload selected and authentication guidance." lightbox="media/deployment-arc-register-configurator-app/upload-support-package-3.png":::
 
-   1. After the upload is complete, you receive a confirmation message. You can also view the upload status in the app.
+   1. After the upload is complete, you receive a confirmation message. You can also view the upload status in the app.-->
 
 ### Clean previous installation
 
@@ -243,4 +257,4 @@ If you have more than one version of the app installed, when you try to open the
 
 - After your machines are registered with Azure Arc, proceed to deploy your Azure Local system via one of the following options:
     - [Deploy via Azure portal](./deploy-via-portal.md).
-    - [Deploy via ARM template](./deployment-azure-resource-manager-template.md).
+    - [Deploy via ARM template](./deployment-azure-resource-manager-template.md).

azure-local/docfx.json

@@ -86,14 +86,14 @@
     },
     "fileMetadata": {
       "monikerRange": {
-      "./*.md": ">=azloc-24111 || =azloc-previous",
-      "./*.yml": ">=azloc-24111 || =azloc-previous"
+      "./*.md": ">=azloc-2411 || =azloc-previous",
+      "./*.yml": ">=azloc-2411 || =azloc-previous"
       }
     },
     "template": [],
     "groups": {
       "version-azlocal": {
-        "moniker_range": ">=azloc-24111 || =azloc-previous",
+        "moniker_range": ">=azloc-2411 || =azloc-previous",
         "dest": "azure-local"
       }
     }

azure-local/known-issues.md

@@ -344,7 +344,7 @@ The following table lists the known issues from previous releases:
 
 ::: moniker-end
 
-::: moniker range="=azloc-previous"
+::: moniker range="=azloc-2411"
 
 ## Known issues for version 2411
 
@@ -397,6 +397,10 @@ The following table lists the known issues from previous releases:
 | Update | When updating the Azure Local instance via the Azure Update Manager, the update progress and results may not be visible in the Azure portal.| To work around this issue, on each node, add the following registry key (no value needed):<br><br>`New-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Services\HciCloudManagementSvc\Parameters" -force`</br><br> Then on one of the nodes, restart the Cloud Management cluster group. </br><br>`Stop-ClusterGroup "Cloud Management"`</br><br>`Start-ClusterGroup "Cloud Management"`</br><br> This won't fully remediate the issue as the progress details may still not be displayed for a duration of the update process. To get the latest update details, you can [Retrieve the update progress with PowerShell](./update/update-via-powershell-23h2.md#step-6-track-update-progress). |
 | Update <!--26659432--> |In some cases, `SolutionUpdate` commands could fail if run after the `Send-DiagnosticData` command.  | Make sure to close the PowerShell session used for `Send-DiagnosticData`. Open a new PowerShell session and use it for `SolutionUpdate` commands.|
 
+::: moniker-end
+
+::: moniker range="=azloc-previous"
+
 ## Known issues for version 2408.2
 
 This software release maps to software version number **2408.2.7**.
@@ -1206,4 +1210,4 @@ Here are the known issues from previous releases:
 
 ## Next steps
 
-- Read the [Deployment overview](./deploy/deployment-introduction.md).
+- Read the [Deployment overview](./deploy/deployment-introduction.md).

azure-local/manage/add-server.md

@@ -182,4 +182,4 @@ You might need to provide diagnostic logs from the new node that's to be added t
 
 ## Next steps
 
-- Learn more about how to [Repair a node](./repair-server.md).
+- Learn more about how to [Repair a node](./repair-server.md).

azure-local/security-update/security-update.md

@@ -3,7 +3,7 @@ title:  Security updates for Azure Local, version 23H2
 description: Security updates for Azure Local, version 23H2.
 author: alkohli
 ms.topic: conceptual
-ms.date: 05/12/2025
+ms.date: 04/25/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ---
@@ -306,7 +306,7 @@ For a list of the files that are provided in this update, download the file info
 
 ::: moniker-end
 
-::: moniker range="azloc-previous"
+::: moniker range="azloc-2411"
 
 ## November OS security update (KB) for Azure Local
 
@@ -344,6 +344,10 @@ To install the LCU on your Azure Local instance, see [Update Azure Stack Local i
 
 For a list of the files that are provided in this update, download the file information for [Cumulative update KB 5046618](https://go.microsoft.com/fwlink/?linkid=2296832).
 
+::: moniker-end
+
+::: moniker range="azloc-previous"
+
 ## October OS security update (KB 5044288) for Azure Local
 
 <!-- [!INCLUDE [applies-to](../includes/hci-applies-to-23h2.md)] -->

azure-local/update/import-discover-updates-offline-23h2.md

@@ -5,7 +5,7 @@ author: ronmiab
 ms.author: robess
 ms.topic: how-to
 ms.reviewer: arduppal
-ms.date: 05/16/2025
+ms.date: 05/27/2025
 ---
 
 # Import and discover update packages with limited connectivity
@@ -26,21 +26,32 @@ This article explains how to discover and import update packages for Azure Local
 
 - Review [About updates for Azure Local](./about-updates-23h2.md) to understand the update process.
 
-- Review [Azure Local release information](../release-information-23h2.md).
+- Review [Azure Local release information](../release-information-23h2.md) to check supported paths.
 
-## Step 1: Download Solution update bundle
+## Solution update bundle
+
+The **CombinedSolutionBundle** is a zip file that contains the update package for the Azure Stack HCI OS, core agents and services, and the solution extension. The **CombinedSolutionBundle** is named `CombinedSolutionBundle.<build number>.zip`, where `<build number>` is the build number for the release. The SHA256 is used to check the integrity of your download.
+
+The following table lists the available **CombinedSolutionBundle** versions and associated SHA256 hash.
 
-The **CombinedSolutionBundle** is a zip file that contains the update package for the Azure Stack HCI OS, core agents and services, and the solution extension. The associated SHA256 hash helps verify the integrity of the downloaded zip.
+| OS Build     | Download URI       | SHA256                          |
+|--------------|--------------------|---------------------------------|
+| 25398.1551   | [11.2504.1001.19](https://azurestackreleases.download.prss.microsoft.com/dbazure/AzureLocal/CombinedSolutionBundle/11.2504.1001.19/CombinedSolutionBundle.11.2504.1001.19.zip) <br><br> Availability date: <br><br> 2025-04-21  | BAA0CEB0CF695CCCF36E39F70BF2E67E0B886B91CDE97F8C2860CE299E2A5126 |
+| 25398.1486   | [10.2503.0.13](https://azurestackreleases.download.prss.microsoft.com/dbazure/AzureLocal/CombinedSolutionBundle/10.2503.0.13/CombinedSolutionBundle.10.2503.0.13.zip) <br><br> Availability date: <br><br> 2025-03-31 | 3A2E5D7F1B8C9F6A2D7E5B8C9F6A2D7E5B8C9F6A2D7E5B8C9F6A2D7E5B8C9F6 |
 
-Follow these steps:
+> [!NOTE]
+> It may take up to 24 hours after a release for the latest version of the **CombinedSolutionBundle**  and the associated SHA256 hash to be available. For more information on the release cadence, see [Azure Local release information](../release-information-23h2.md).
 
-1. To download the bundle and note the SHA256 hash, see the **Download URI** column in [Azure Local release information summary](../release-information-23h2.md#supported-versions-of-azure-local).
+## Step 1: Download Solution update bundle
 
-   - The **CombinedSolutionBundle** is named `CombinedSolutionBundle.<build number>.zip`, where `<build number>` is the build number for the release.
+1. Download the bundle and note the SHA256 hash from the [Solution update bundle](#solution-update-bundle) table. Run this command:
 
-   - The SHA256 hash is also in the release notes. Use the hash to check the integrity of your download.
+   ```PowerShell
+   # Download the CombinedSolutionBundle
+   Invoke-WebRequest -Uri "<download URI>" -OutFile "C:\ClusterStorage\Infrastructure_1\Shares\SU1_Infrastructure_1\import\CombinedSolutionBundle.<build number>.zip"
+   ```
 
-1. Verify the SHA256 hash of the downloaded **CombinedSolutionBundle**.
+1. Verify the SHA256 hash of the downloaded **CombinedSolutionBundle**. Run this command:
 
    ```PowerShell
    # Verify the SHA256 hash of the downloaded CombinedSolutionBundle
@@ -49,23 +60,23 @@ Follow these steps:
 
 ## Step 2: Import the Solution update bundle
 
-1. Create a folder for the update service to discover at the following location in the infrastructure volume of your system.
+1. Create a folder for the update service to discover at the following location in the infrastructure volume of your system. Run this command:
 
    ```PowerShell
    # Create a folder for the update service to discover
    New-Item C:\ClusterStorage\Infrastructure_1\Shares\SU1_Infrastructure_1\import -ItemType Directory
    ```
 
-1. Copy the CombinedSolutionBundle you downloaded to the folder you created.
+1. Copy the CombinedSolutionBundle you downloaded to the folder you created. Run this command:
 
-1. Extract the contents to the Solution subfolder.
+1. Extract the contents to the Solution subfolder. Run this command:
 
    ```PowerShell
    # Extract the contents of the CombinedSolutionBundle to the Solution subfolder
    Expand-Archive -Path C:\ClusterStorage\Infrastructure_1\Shares\SU1_Infrastructure_1\import\CombinedSolutionBundle.<build number>.zip -DestinationPath C:\ClusterStorage\Infrastructure_1\Shares\SU1_Infrastructure_1\import\Solution
    ```
 
-1. Import the package to the update service.
+1. Import the package to the update service. Run this command:
 
    ```PowerShell
    # Import the module

azure-local/whats-new.md

@@ -5,7 +5,7 @@ ms.topic: overview
 author: alkohli
 ms.author: alkohli
 ms.service: azure-local
-ms.date: 05/22/2025
+ms.date: 05/08/2025
 ---
 
 # What's new in Azure Local?
@@ -16,35 +16,6 @@ ms.date: 05/22/2025
 
 This article lists the various features and improvements that are available in Azure Local. The latest version of Azure Local solution focuses on cloud-based deployment and updates, cloud-based monitoring, new and simplified experience for Azure Local virtual machine (VM) management, security, and more.
 
-::: moniker range="=azloc-2505"
-
-There are two 2505 releases for May. Here are the details of each release:
-
-|Solution version  |OS version |Deployment  |
-|---------|---------|---------|
-|12.2505.1001.23 |  26100.4061        | New deployments only.        |
-|11.2505.1001.22  | 25398.1611        | Existing deployments only.        |
-
-For more information, see [Release information summary](./release-information-23h2.md).
-
-## Features and improvements in 2505
-
-This release has the following features and improvements:
-
-- **OS version changes**:
-
-    - In the last release (2504), a new operating system was introduced for Azure Local deployments. For 2505, all the new deployments of Azure Local will run OS version **26100.4061**. You can download the 2505 OS image from the Azure portal. You also need to get the driver compatible with Azure Local 12.2505 or Windows Server 2025. If a compatible driver is not available, you can use the 2503 image.
-    
-        Existing deployments of Azure Local will continue to use OS version **25398.1611**. For more information, see [Release information summary](./release-information-23h2.md).
-
-    - If you've purchased Integrated System or Premier solution hardware from the [Azure Local Catalog](https://aka.ms/AzureStackHCICatalog) through your preferred Microsoft hardware partner, the OS should be preinstalled. Work with your Original Equipment Manufacturer (OEM) to get the OS image compatible with **12.2505** and driver compatible with Azure Local 12.2505 or Windows Server 2025.
-
-- **.NET updates**: This build uses .NET version **8.0.16** for both .NET Runtime and ASP.NET Core. For more details, see [Download .NET 8.0](https://dotnet.microsoft.com/download/dotnet/8.0).
-
-- **Update changes**: This release includes reliability improvements to the update process. For more information, see [Fixed issues in 2505](./known-issues.md?view=azloc-2505&preserve-view=true#fixed-issues).
-
-::: moniker-end
-
 ::: moniker range="=azloc-2504"
 
 Starting with 2504 release, Microsoft introduced a new versioning schema. There are two 2504 releases for April. Here are the details of each release:
@@ -199,7 +170,7 @@ For more information on improvements in this release, see the [Fixed issues in 2
 
 ::: moniker-end
 
-::: moniker range="=azloc-previous"
+::: moniker range="=azloc-2411"
 
 ## Features and improvements in 2411
 
@@ -248,6 +219,10 @@ This release has the following features and improvements:
 
 - **AKS on Azure Local** - This release has several new features and enhancements for AKS on Azure Local. For more information, see [What's new in AKS on Azure Local](/azure/aks/hybrid/aks-whats-new-23h2).
 
+::: moniker-end
+
+::: moniker range="=azloc-previous"
+
 ## Features and improvements in 2408.2
 
 This release has the following features and improvements:
@@ -695,4 +670,4 @@ For more information, see [Optimize storage with ReFS deduplication and compress
 - Read the [blog announcing the general availability of Azure Local](https://techcommunity.microsoft.com/t5/azure-stack-blog/azure-stack-hci-version-23h2-is-generally-available/ba-p/4046110).
 - For Azure Local deployments:
   - Read the [Deployment overview](./deploy/deployment-introduction.md).
-  - Learn how to [Deploy Azure Local via the Azure portal](./deploy/deploy-via-portal.md).
+  - Learn how to [Deploy Azure Local via the Azure portal](./deploy/deploy-via-portal.md).