From 56eeab6f5295e0efcf95d0494ca8fcb924e7cee1 Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Thu, 5 Sep 2024 02:19:42 +0000 Subject: [PATCH] Syncing content from committish 34a4dfe7ccb4708f635e3e32899a9070b5c1f290 --- src/controls/dev/PipsPager/PipsPager.cpp | 5 ----- src/controls/dev/PipsPager/PipsPager.h | 1 - src/eng/Version.Details.xml | 8 ++++---- src/eng/sdkconfig.targets | 10 +--------- src/src/projection/Directory.Build.props | 20 -------------------- 5 files changed, 5 insertions(+), 39 deletions(-) diff --git a/src/controls/dev/PipsPager/PipsPager.cpp b/src/controls/dev/PipsPager/PipsPager.cpp index 781133b07a..239ea99041 100644 --- a/src/controls/dev/PipsPager/PipsPager.cpp +++ b/src/controls/dev/PipsPager/PipsPager.cpp @@ -68,11 +68,6 @@ PipsPager::PipsPager() SetDefaultStyleKey(this); } -PipsPager::~PipsPager() -{ - RestoreLayoutVirtualization(); -} - void PipsPager::OnApplyTemplate() { winrt::AutomationProperties::SetName(*this, ResourceAccessor::GetLocalizedStringResource(SR_PipsPagerNameText)); diff --git a/src/controls/dev/PipsPager/PipsPager.h b/src/controls/dev/PipsPager/PipsPager.h index c23c5754f1..75653eead0 100644 --- a/src/controls/dev/PipsPager/PipsPager.h +++ b/src/controls/dev/PipsPager/PipsPager.h @@ -20,7 +20,6 @@ class PipsPager : { public: PipsPager(); - ~PipsPager(); /* IFrameworkElement */ void OnApplyTemplate(); diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index df20fd08fd..dc05f67eff 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - 71b031a9b43c2a15c57133c4141fbf45f7ecd54b + 899f2c5ad470039ce07b6182a35efc2048d5682d - + https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP 2755c21b3b1bad26019e8a8d721f1675c2685720 - + https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP 2755c21b3b1bad26019e8a8d721f1675c2685720 diff --git a/src/eng/sdkconfig.targets b/src/eng/sdkconfig.targets index 1be267b701..63530a8a38 100644 --- a/src/eng/sdkconfig.targets +++ b/src/eng/sdkconfig.targets @@ -8,13 +8,5 @@ - - - - - - $(CoreCompileDependsOn); - CsWinRTIncludeProjection - - + \ No newline at end of file diff --git a/src/src/projection/Directory.Build.props b/src/src/projection/Directory.Build.props index 82fb24f573..e3a954ff3e 100644 --- a/src/src/projection/Directory.Build.props +++ b/src/src/projection/Directory.Build.props @@ -55,25 +55,5 @@ Windows.Foundation.Metadata.AttributeName; - - - $(WinUI_CSWinRTIncludes); - Windows.UI.Xaml.Interop.IBindableIterable; - Windows.UI.Xaml.Interop.IBindableVector; - Windows.UI.Xaml.Interop.INotifyCollectionChanged; - Windows.UI.Xaml.Interop.NotifyCollectionChangedAction; - Windows.UI.Xaml.Interop.INotifyCollectionChangedEventArgs; - Windows.UI.Xaml.Interop.INotifyCollectionChangedEventArgsFactory; - Windows.UI.Xaml.Interop.NotifyCollectionChangedEventArgs; - Windows.UI.Xaml.Interop.NotifyCollectionChangedEventHandler; - - - - - $(WinUI_CSWinRTExcludes); - Windows.UI.Xaml.Interop.IBindableVectorView; - - \ No newline at end of file