diff --git a/dxaml/xcp/core/core/elements/DragEventArgs.cpp b/dxaml/xcp/core/core/elements/DragEventArgs.cpp index b934ad05c1..4470d5952b 100644 --- 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 +#include + +// 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()) + { + wrl::ComPtr 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(allowedOperations))); + } + } } if(pDragDropAsyncOperation) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a82486456e..c08d5bc38c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - 7d84b710d4c08dc9b8c5506de07bda50c9439369 + 5e13356548a275bd6963d391a7e227b6614174f5 - + https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP - 2c479f6a2492832f2078a92c9d0489193ff9edba + 6b9f6f6f4f2977b56b347e943e6804b29886ed19 - + https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP - 2c479f6a2492832f2078a92c9d0489193ff9edba + 6b9f6f6f4f2977b56b347e943e6804b29886ed19 diff --git a/packages.config b/packages.config index adc9d429a0..a315a8ef77 100644 --- 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. --> - +