Syncing content from committish f50080fe8b45d7b8688736637407250b0904d209

Author: reunion-maestro-bot

src/dxaml/xcp/dxaml/lib/Selector_Partial.cpp

@@ -19,6 +19,11 @@
 #include "PropertyPathParser.h"
 #include "PropertyPath.h"
 #include "Callback.h"
+#include "FrameworkUdk/Containment.h"
+
+// Bug 61499680: [1.8 Servicing] ListView/Selector: E_BOUNDS crash in OnGettingFocus after bulk item refresh
+
+#define WINAPPSDK_CHANGEID_61499680 61499680, WinAppSDK_1_8_7
 
 using namespace xaml_data;
 using namespace DirectUI;
@@ -2406,9 +2411,24 @@ _Check_return_
         shouldFocus = TRUE;
     }
 
-    if (shouldFocus)
+    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_61499680>())
     {
-        SetFocusedIndex(index);
+        if (shouldFocus || GetFocusedIndex() >= static_cast<INT>(nCount))
+        {
+            // Always update m_focusedIndex when we have focus. Also correct it when the Selector
+            // doesn't currently have focus (e.g. the focused container was recycled during an item
+            // removal) but m_focusedIndex is stale and points beyond the valid item range.
+            // In that case, if current focused index goes out of range, we should set the focused
+            // index to value asked by caller. Note that we have already verified that index is valid above.
+            SetFocusedIndex(index);
+        }
+    }
+    else
+    {
+        if (shouldFocus)
+        {
+            SetFocusedIndex(index);
+        }
     }
 
     if (GetFocusedIndex() == -1)

src/eng/Version.Details.xml

@@ -2,39 +2,39 @@
 <!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.8.0-20260222.0.release">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.8.0-20260415.0.release">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>9caca5e8b525dd734122d751e06d60dbf3268e22</Sha>
+      <Sha>68a9959e7211bf10533958229c89594f4160ba4c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.8.0-stable-27108.1029.260124-1700.1">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.8.0-stable-27108.1043.260414-0920.1">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>b68a9103d8543e623d349cb98d65c054375fcd0c</Sha>
+      <Sha>a007e3a86ec33bad02efd987d6a4617e36c78c59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.8.0-stable-27108.1029.260124-1700.1">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.8.0-stable-27108.1043.260414-0920.1">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>b68a9103d8543e623d349cb98d65c054375fcd0c</Sha>
+      <Sha>a007e3a86ec33bad02efd987d6a4617e36c78c59</Sha>
     </Dependency>
     <!-- Microsoft-WinUI-SDK subdirectory in WindowsAppSDKClosed (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.)  -->
     <Dependency Name="Microsoft.Build.Msix" Version="1.7.0-release.20241114.0">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
       <Sha>bebdf37da96fd9d4c4a6588a8000ceee880cd373</Sha>
     </Dependency>
     <!-- Closed source binary (ex PTLS and WinUIEdit) -->
-    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.810.0-stable.20260126.0">
+    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.810.0-stable.20260325.0">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
-      <Sha>e1c507a3c1688a9f36e5a66bf0715f17f552fc9b</Sha>
+      <Sha>72fb44e58aaee8b88124a6cfea181e71c632808e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsAppSDK.Base" Version="1.8.251216001">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator</Uri>
       <Sha>66cd2dc7827ad19d84cd68743af8570d9aca1c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsAppSDK.Foundation" Version="1.8.260222000">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation" Version="1.8.260415000">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>9caca5e8b525dd734122d751e06d60dbf3268e22</Sha>
+      <Sha>68a9959e7211bf10533958229c89594f4160ba4c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="1.8.260125001">
+    <Dependency Name="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="1.8.260415001">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>b68a9103d8543e623d349cb98d65c054375fcd0c</Sha>
+      <Sha>a007e3a86ec33bad02efd987d6a4617e36c78c59</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>