Syncing content from committish 570a3092782a0865c8c9c44002a5ecb01d1928e4

microsoft · May 14, 2024 · 326f5a6 · 326f5a6
1 parent d4c4e53
commit 326f5a6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/dxaml/xcp/core/core/elements/DragEventArgs.cpp b/dxaml/xcp/core/core/elements/DragEventArgs.cpp
@@ -6,6 +6,11 @@
 #include "Activators.g.h"
 
 #include <WRLHelper.h>
+#include <FrameworkUdk/Containment.h>
+
+// Bug 49668737: [1.4 Servicing] After dragging an FE Home item, all item drops on breadcrumbs don't support Move after first drag
+#define LOCAL_WINAPPSDK_CHANGEID_49668737 49668737
+
 
 // Initialize the DragEventArgs with any framework specific context.
 _Check_return_ HRESULT CDragEventArgs::Create(_In_ CCoreServices* pCore, _Outptr_ CDragEventArgs** ppArgs, _In_opt_ IInspectable* pWinRtDragInfo, _In_opt_ IInspectable* pDragDropAsyncOperation)
@@ -19,6 +24,16 @@ _Check_return_ HRESULT CDragEventArgs::Create(_In_ CCoreServices* pCore, _Outptr
     if(pWinRtDragInfo)
     {
         IFC_RETURN(spArgs->m_spWinRtDragInfo.reset(pWinRtDragInfo));
+        if (WinAppSdk::Containment::IsChangeEnabled<LOCAL_WINAPPSDK_CHANGEID_49668737>())
+        {
+            wrl::ComPtr<mui::DragDrop::IDragInfo> dragInfo;
+            if (SUCCEEDED(pWinRtDragInfo->QueryInterface(IID_PPV_ARGS(&dragInfo))))
+            {
+                wadt::DataPackageOperation allowedOperations;
+                IFC_RETURN(dragInfo->get_AllowedOperations(&allowedOperations));
+                IFC_RETURN(spArgs->put_AllowedOperations(static_cast<DirectUI::DataPackageOperation>(allowedOperations)));
+            }
+        }
     }
 
     if(pDragDropAsyncOperation)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -2,17 +2,17 @@
 <!-- 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.4.0-20240211.0">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.4.0-20240404.0">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>7d84b710d4c08dc9b8c5506de07bda50c9439369</Sha>
+      <Sha>5e13356548a275bd6963d391a7e227b6614174f5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.4.4-CI-22624.1061.240209-1942.0">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.4.4-CI-22624.1068.240416-1016.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>2c479f6a2492832f2078a92c9d0489193ff9edba</Sha>
+      <Sha>6b9f6f6f4f2977b56b347e943e6804b29886ed19</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.4.4-CI-22624.1061.240209-1942.0">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.4.4-CI-22624.1068.240416-1016.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>2c479f6a2492832f2078a92c9d0489193ff9edba</Sha>
+      <Sha>6b9f6f6f4f2977b56b347e943e6804b29886ed19</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/packages.config b/packages.config
@@ -34,7 +34,7 @@
        so we need to pull down this package so we can deploy it to Helix machines. -->
   <package id="Microsoft.VCRTForwarders.140" version="1.0.6" />
   <!-- Microsoft-WinUI-SDK repo (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.)  -->
-  <package id="Microsoft.Build.Msix" version="1.4.0-zmain.240202.1" />
+  <package id="Microsoft.Build.Msix" version="1.4.0-zmain.240510.3" />
   <!-- Localized MUI and resw files -->
   <package id="Microsoft.Internal.WinUILocalizationResources" version="230926.0.0" />
   <!-- Windows SDK build tools (e.g. makeappx.exe) -->