Syncing content from committish 34a4dfe7ccb4708f635e3e32899a9070b5c1f290

microsoft · Sep 5, 2024 · 56eeab6 · 56eeab6
1 parent e6aafa6
commit 56eeab6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 39 deletions.
diff --git 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
@@ -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
@@ -2,15 +2,15 @@
 <!-- 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-20240821.0.release">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.6.0-20240828.0.release">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>71b031a9b43c2a15c57133c4141fbf45f7ecd54b</Sha>
+      <Sha>899f2c5ad470039ce07b6182a35efc2048d5682d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.6.4-CI-26107.1009.240820-1034.0">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.6.4-CI-26107.1010.240827-1251.1">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
       <Sha>2755c21b3b1bad26019e8a8d721f1675c2685720</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.6.4-CI-26107.1009.240820-1034.0">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.6.4-CI-26107.1010.240827-1251.1">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
       <Sha>2755c21b3b1bad26019e8a8d721f1675c2685720</Sha>
     </Dependency>

diff --git a/src/eng/sdkconfig.targets b/src/eng/sdkconfig.targets
@@ -8,13 +8,5 @@
   <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>
-
-  <!-- TODO: Remove this when https://github.com/microsoft/CsWinRT/issues/530 is fixed and we've picked up a new version. -->
-  <PropertyGroup>
-    <CoreCompileDependsOn Condition="'$(CsWinRTExe)' != ''">
-        $(CoreCompileDependsOn);
-        CsWinRTIncludeProjection
-    </CoreCompileDependsOn>
-  </PropertyGroup>
+  </ItemGroup>  
 </Project>
diff --git a/src/src/projection/Directory.Build.props b/src/src/projection/Directory.Build.props
@@ -55,25 +55,5 @@
       Windows.Foundation.Metadata.AttributeName;
     </WinUI_CSWinRTIncludes>
 
-    <!-- These types are custom type mappings, but WinUI happened to project them.
-         They should be removed at some point. -->
-    <WinUI_CSWinRTIncludes>
-      $(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_CSWinRTIncludes>
-
-    <!-- Exclude type that moved to the Windows SDK projection. -->
-    <WinUI_CSWinRTExcludes>
-      $(WinUI_CSWinRTExcludes);
-      Windows.UI.Xaml.Interop.IBindableVectorView;
-    </WinUI_CSWinRTExcludes>
-
   </PropertyGroup>
 </Project>