Merge pull request #3724 from MicrosoftDocs/main638871590556775539sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

azure-local/TOC.yml

@@ -147,13 +147,6 @@ items:
         href: deploy/deployment-azure-arc-gateway-use-without-proxy.md
   - name: Deploy using local identity with Key Vault
     href: deploy/deployment-local-identity-with-key-vault.md
-  - name: Deploy SDN
-    items:
-    - name: Using Express scripts
-      href: deploy/sdn-express-23h2.md
-    - name: Using Windows Admin Center
-      href: deploy/sdn-wizard-23h2.md  
-  
   - name: Deploy workloads
     items:
     - name: Run AKS on Azure Local

azure-local/known-issues.md

@@ -25,13 +25,13 @@ For more information about new features in this release, see [What's new for Azu
 
 For the 2506 release of Azure Local, Microsoft released two security updates: one for existing deployments and another for new deployments. The following table provides information about different deployment types, their corresponding security updates, and OS builds:
 
-| Deployment type  | Solution version  | OS build  |
+| Solution version  | OS build  |
 |---------|---------|---------|
-| Existing deployments    | 11.2506.1001.28          | 25398.1665         |
-| New deployments    | 12.2506.1001.29         | 26100.4349        |
+| 11.2506.1001.28          | 25398.1665         |
+| 12.2506.1001.29         | 26100.4349        |
 
 > [!IMPORTANT]
-> The new deployments of this software use the **12.2506.1001.29** build. You can also update an existing deployment from 2504 using **11.2506.1001.28**.
+> The new deployments of this software use the **12.2506.1001.29** build. You can also update an existing deployment from 2505 using **11.2506.1001.28**.
 
 Release notes for this version include the issues fixed in this release, known issues in this release, and release note issues carried over from previous versions.
 

azure-local/release-information-23h2.md

@@ -62,6 +62,9 @@ If your cluster supports [Solution Builder Extension software updates](./update/
 
 The following tables summarize the release information for Azure Local across all supported versions. All dates are listed in ISO 8601 format: *YYYY-MM-DD*.
 
+> [!IMPORTANT]
+> The new deployments of this software use the **12.2506.1001.29** build. You can also update an existing deployment from 2505 using **11.2506.1001.28**.
+
 #### [OS build 25398.xxxx](#tab/OS-build-25398-xxxx)
 
 | Solution version | OS build | Security update | What's new | Known issues |

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

@@ -43,6 +43,7 @@ For more information on the release cadence, see [Azure Local release informatio
 
 | OS Build     | Download URI       | SHA256                          |
 |--------------|--------------------|---------------------------------|
+| 25398.1665   | [11.2506.1001.28](https://azurestackreleases.download.prss.microsoft.com/dbazure/AzureLocal/CombinedSolutionBundle/11.2506.1001.28/CombinedSolutionBundle.11.2506.1001.28.zip) <br><br> Availability date: <br><br> 2025-07-02 | 18975A06372192DD7249B5DCF8844EA0A68AD08B1C9F3C554FABF79EA74CB290 |
 | 25398.1611   | [11.2505.1001.22](https://azurestackreleases.download.prss.microsoft.com/dbazure/AzureLocal/CombinedSolutionBundle/11.2505.1001.22/CombinedSolutionBundle.11.2505.1001.22.zip) <br><br> Availability date: <br><br> 2025-05-28 | AB2C7CE74168BF9FD679E7CE644BC57A20A0A3A418C5E8663EBCF53FC0B45113 |
 | 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  | 7658C5CBAE241951C786D06D35E8B09A1160FDC5E9B8CAEDEB374ECC22A2CB68 |
 | 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 | BAA0CEB0CF695CCCF36E39F70BF2E67E0B886B91CDE97F8C2860CE299E2A5126 |
@@ -51,6 +52,7 @@ For more information on the release cadence, see [Azure Local release informatio
 
 | OS Build     | Download URI       | SHA256                          |
 |--------------|--------------------|---------------------------------|
+| 26100.4349   | [12.2506.1001.29](https://azurestackreleases.download.prss.microsoft.com/dbazure/AzureLocal/CombinedSolutionBundle/12.2506.1001.29/CombinedSolutionBundle.12.2506.1001.29.zip) <br><br> Availability date: <br><br> 2025-07-02 | C8227DF98F97FDE807A2B711206A1FE23531340DC717F89CDA7A324BA0B316C7 |
 | 26100.4061   | [12.2505.1001.23](https://azurestackreleases.download.prss.microsoft.com/dbazure/AzureLocal/CombinedSolutionBundle/12.2505.1001.23/CombinedSolutionBundle.12.2505.1001.23.zip) <br><br> Availability date: <br><br> 2025-05-28 | 29E5F6732D9B1BD4E0C2667F6FB1D7F43ADF78B4AEA8E34486C7F03DD46D155C |
 
 ---

azure-local/whats-new.md

@@ -21,10 +21,10 @@ This article lists the various features and improvements that are available in A
 
 There are two 2506 releases for June. Here are the details of each release:
 
-|Solution version  |OS version |Deployment  |
-|---------|---------|---------|
-|12.2506.1001.29 |  26100.4349        | New deployments only.        |
-|11.2506.1001.28  | 25398.1665        | Existing deployments only.        |
+|Solution version  | OS version |
+|---------|---------|
+|12.2506.1001.29 |  26100.4349  |
+|11.2506.1001.28  | 25398.1665  |
 
 For more information, see [Release information summary](./release-information-23h2.md).
 
@@ -41,8 +41,6 @@ This release has the following features and improvements:
         Existing deployments of Azure Local continue to use OS version **25398.1665**. For more information, see [Release information summary](./release-information-23h2.md).
 
     - If you 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.2506** and driver compatible with OS version **26100.4349** or Windows Server 2025.
-
-    - The new OS media uses consistent device naming (CDN) if the hardware supports it and ensures consistent network adapter naming.
 
 - **.NET updates**: This build uses .NET version **8.0.17** for both .NET Runtime and ASP.NET Core. For more information, see [Download .NET 8.0](https://dotnet.microsoft.com/download/dotnet/8.0).