Syncing content from committish c4bd3c26ce72eeda7a036d18295374c450958b92

Author: reunion-maestro-bot

src/Packages.props

@@ -30,6 +30,7 @@
     <PackageReference Update="CommunityToolkit.WinUI.Controls.SettingsControls" Version="$(CommunityToolkitWinUIVersion)" />
     <PackageReference Update="CommunityToolkit.WinUI.Converters" Version="$(CommunityToolkitWinUIVersion)" />
     <PackageReference Update="CommunityToolkit.WinUI.Animations" Version="$(CommunityToolkitWinUIVersion)" />
+    <PackageReference Update="CommunityToolkit.WinUI.Controls.Primitives" Version="$(CommunityToolkitWinUIVersion)" />
     <PackageReference Update="Microsoft.Graphics.Win2D" Version="$(GraphicsWin2DVersion)" />
     <PackageReference Update="Win2d.uwp" Version="$(Win2DUWPVersion)" />
     <PackageReference Update="Win2d.winui" Version="$(Win2DWinUIVersion)" />

src/dxaml/xcp/core/inc/InputServices.h

@@ -19,6 +19,10 @@
 #include "FrameworkInputViewHandler.h"
 #include "TextInputProducerHelper.h"
 #include <Microsoft.UI.Input.Partner.h>
+#include <FrameworkUdk/Containment.h>
+
+// Bug 56962652: [1.6 Servicing] [FileExplorer] Fix crash due to activating DirectManipulationManager after HWND is destroyed
+#define WINAPPSDK_CHANGEID_56962652 56962652
 
 // Uncomment for DManip debug outputs.
 //#define DM_DEBUG
@@ -1081,14 +1085,56 @@ class CInputServices final
         return status == XcpDMViewportRunning || status == XcpDMViewportInertia || status == XcpDMViewportSuspended || status == XcpDMViewportAutoRunning;
     }
 
+    // Checks if a window handle is valid the same way DirectManipulation's IDirectManipulationManager::Activate does.
+    static _Check_return_ HRESULT IsWindowHandleValid(_In_ HWND hWnd)
+    {
+        if (!IsWindow(hWnd))
+        {
+            return E_INVALIDARG;
+        }
+
+        DWORD hWndThreadId = ::GetWindowThreadProcessId(hWnd, NULL);
+        if (::GetCurrentThreadId() != hWndThreadId)
+        {
+            return HRESULT_FROM_WIN32(ERROR_WINDOW_OF_OTHER_THREAD);
+        }
+
+        return S_OK;
+    }
+
     bool CanDMContainerInitialize() const
     {
         return !m_islandInputSiteRegistrations.empty();
     }
 
-    bool CanDMContainerInitialize(_In_ CUIElement* const dmContainer) const
+    static bool CanDMIslandInputSiteInitialize(_In_opt_ ixp::IIslandInputSitePartner* const islandInputSite)
     {
-        return dmContainer->CanDMContainerInitialize();
+        if (nullptr != islandInputSite)
+        {
+            HWND inputHwnd = CInputServices::GetUnderlyingInputHwndFromIslandInputSite(islandInputSite);
+ 
+            // Make sure the window handle is valid. The same code as DManip's IDirectManipulationManager::Activate
+            // is used. This ensures that Xaml will not attempt to activate a DManip manager with a handle that has
+            // already been destroyed with a WM_DESTROY message.
+            return SUCCEEDED(CInputServices::IsWindowHandleValid(inputHwnd));
+        }
+        return false;
+    }
+
+    // The DirectManipulationManager for a DMContainer can only occur after GetElementIslandInputSite returns a valid
+    // IslandInputSite since it is being used for DManip's initialization.
+    static bool CanDMContainerInitialize(_In_ CUIElement* const dmContainer)
+    {
+        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_56962652>())
+        {
+            wrl::ComPtr<ixp::IIslandInputSitePartner> islandInputSite = dmContainer->GetElementIslandInputSite();
+
+            return CInputServices::CanDMIslandInputSiteInitialize(islandInputSite.Get());
+        }
+        else
+        {
+            return dmContainer->CanDMContainerInitialize();
+        }
     }
 
     // Creates a CUIDMContainer and CUIDMContainerHandler instance for the provided element and sets them up for future usage.

src/dxaml/xcp/core/input/InputServices.cpp

@@ -3355,7 +3355,7 @@ CInputServices::InitializeDirectManipulationContainer(
     IPALDirectManipulationService* pNewDirectManipulationService = NULL;
     IPALDirectManipulationService* pDirectManipulationService = NULL;
 
-    ASSERT(CanDMContainerInitialize(pDMContainer));
+    ASSERT(CInputServices::CanDMContainerInitialize(pDMContainer));
 
     IFCPTR(pDMContainer);
 
@@ -3640,6 +3640,13 @@ CInputServices::InitializeDirectManipulationContainers()
         // and real viewport is instantiated.
         for (auto& islandInputSiteRegistration : m_islandInputSiteRegistrations)
         {
+            if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_56962652>())
+            {
+                if (!CInputServices::CanDMIslandInputSiteInitialize(islandInputSiteRegistration.IslandInputSite().Get()))
+                {
+                    continue;
+                }
+            }
             if (!islandInputSiteRegistration.DMCrossSlideService())
             {
                 // Pre-create a DM manager for potential cross-slide handling, using cross-slide viewports
@@ -3678,7 +3685,7 @@ CInputServices::InitializeDirectManipulationContainers()
         {
             // Only keep containers that are inactive or do not have a valid IslandInputSite.
             auto pDMContainer = elem.lock();
-            return pDMContainer && (!pDMContainer->IsActive() || !pDMContainer->CanDMContainerInitialize());
+            return pDMContainer && (!pDMContainer->IsActive() || !CInputServices::CanDMContainerInitialize(pDMContainer));
         });
 
         // Process all the remaining active containers

src/eng/Version.Details.xml

@@ -2,27 +2,27 @@
 <!-- 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.6.0-20250401.2.release">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.6.0-20250429.2.release">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>414efd818c368210590c1e5b593b96f84cc3fbef</Sha>
+      <Sha>6c54c38d820751bfbf738cd23d63d88f987707da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.6.4-CI-27106.2609.250401-0931.0">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.6.4-CI-27106.2611.250414-1100.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>bc5dd07ec77079c367657d193154a29681300d42</Sha>
+      <Sha>aaee24f9a54adad0612b7f29001111ab4ee691cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.6.4-CI-27106.2609.250401-0931.0">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.6.4-CI-27106.2611.250414-1100.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>bc5dd07ec77079c367657d193154a29681300d42</Sha>
+      <Sha>aaee24f9a54adad0612b7f29001111ab4ee691cc</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.6.0-release.20250401.0">
+    <Dependency Name="Microsoft.Build.Msix" Version="1.6.0-release.20250428.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
-      <Sha>84ead26dd3acbae2be42c469c757e08e4bc8a116</Sha>
+      <Sha>8ecc6008812782550021699a4ba53e903d99b1c1</Sha>
     </Dependency>
     <!-- Closed source binary (ex PTLS and WinUIEdit) -->
-    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.610.0-release.20250401.0">
+    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.610.0-release.20250428.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
-      <Sha>84ead26dd3acbae2be42c469c757e08e4bc8a116</Sha>
+      <Sha>8ecc6008812782550021699a4ba53e903d99b1c1</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

src/eng/sdkconfig.targets

@@ -1,12 +1,27 @@
 <!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project>
+  <!-- 
+      NuGet will see both the latest package from the .NET SDK and
+      the one we are overriding to and thereby emit an warning.
+      Disabling that warning here.
+   -->
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <DisableCheckingDuplicateNuGetItems>true</DisableCheckingDuplicateNuGetItems>
+  </PropertyGroup>
+
   <!--
       Generally, the Microsoft.Windows.SDK.NET.Ref pack is bundled with the .NET SDK. Sometimes we need to override it, and it
-      has to be done in after the Microsoft.NET.SDK has been imported, which means it needs to be in either the .csproj itself,
-      or a .targets file
+      has to be done after the Microsoft.NET.SDK has been imported, which means it needs to be in either the .csproj itself,
+      or a .targets file.  With .NET 9, the package name changed to Microsoft.Windows.SDK.NET.Ref.Windows.  So we'll just remove
+      any version we find before adding our explicitly versioned reference.
    -->
-  <ItemGroup Condition="'$(UsingMicrosoftNETSdk)'=='true' and '$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)'!=''">
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="$(TargetPlatformVersion.TrimEnd('0'))$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)" />
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="$(TargetPlatformVersion.TrimEnd('0'))$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)" />
-  </ItemGroup>  
+  <ItemGroup Condition="'$(UsingMicrosoftNETSdk)'=='true' and '$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)'!='' and $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0-windows'))">
+    <FrameworkReference Remove="Microsoft.Windows.SDK.NET.Ref;Microsoft.Windows.SDK.NET.Ref.Windows" />
+    <FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
+                        IsImplicitlyDefined="true"
+                        Pack="false"
+                        PrivateAssets="All"
+                        TargetingPackVersion="$(TargetPlatformVersion.TrimEnd('0'))$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)"
+                        RuntimeFrameworkVersion="$(TargetPlatformVersion.TrimEnd('0'))$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)" />
+  </ItemGroup>
 </Project>

src/eng/versions.props

@@ -42,7 +42,7 @@
     <IxpTransportPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(VersionDetailsFileContents), 'Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.*?Version="(.*?)"').Groups[1].Value)</IxpTransportPackageVersion>
     <IxpInternalPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(VersionDetailsFileContents), 'Microsoft.Internal.InteractiveExperiences.*?Version="(.*?)"').Groups[1].Value)</IxpInternalPackageVersion>
     <WinUIDetailsNugetVersion>$([System.Text.RegularExpressions.Regex]::Match($(VersionDetailsFileContents), 'Microsoft.Internal.WinUIDetails.*?Version="(.*?)"').Groups[1].Value)</WinUIDetailsNugetVersion>
-    <MicrosoftBuildMsixVersion>1.6.0-release.20250401.0</MicrosoftBuildMsixVersion>
+    <MicrosoftBuildMsixVersion>1.6.0-release.20250428.1</MicrosoftBuildMsixVersion>
     <!-- It is at this point that we might want our non-product code to be able to use a package version different than the primary configuration -->
     <!-- If so, this would probably be the point at which we would override the above version with what is configured for the app                 -->
     <!-- The package version identifies the targeted package version based on the configured packages. -->