Skip to content

Commit de1b1d8

Browse files
author
reunion-maestro-bot
committed
Syncing content from committish 9bfe4c26947308e9805f7aadcf9a0e2d731282df
1 parent 61382c0 commit de1b1d8

File tree

3 files changed

+37
-13
lines changed

3 files changed

+37
-13
lines changed

src/controls/dev/WebView2/InteractionTests/WebView2Tests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ public void MouseXButton2ClickTest()
576576

577577
[TestMethod]
578578
[TestProperty("TestSuite", "A")]
579+
[TestProperty("Ignore", "True")] // Task 59972452: [WinUI] Reenable - WebView2Tests.MouseWheelScrollTest Test in pipeline
579580
public void MouseWheelScrollTest()
580581
{
581582
using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToBasicWebView2" }))

src/dxaml/xcp/dxaml/lib/OrientedVirtualizingPanel_Partial.cpp

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
#include "ItemContainerGenerator.g.h"
2525
#include <math.h>
2626
#include "VisualTreeHelper.h"
27+
#include "FrameworkUdk/Containment.h"
28+
29+
//Bug 59890419: [1.8 Servicing][WASDK][Watson Failure] caused by STOWED_EXCEPTION_80070057_Microsoft.UI.Xaml.dll!CDirectManipulationService::SetContentBounds
30+
#define WINAPPSDK_CHANGEID_59890419 59890419, WinAppSDK_1_8_3
2731

2832
//#define OVP_DEBUG
2933

@@ -4130,7 +4134,26 @@ OrientedVirtualizingPanel::ComputePixelExtent(
41304134

41314135
if (nLineCount > 0)
41324136
{
4133-
extent = (DOUBLE) (cumulatedChildDim + cumulatedChildDim / nLineCount * (m_lineCount - nLineCount));
4137+
if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_59890419>())
4138+
{
4139+
// safeguard for subtraction underflow as both m_lineCount & nLineCount are UINT
4140+
if (m_lineCount >= nLineCount)
4141+
{
4142+
extent = (DOUBLE) (cumulatedChildDim + cumulatedChildDim / nLineCount * (m_lineCount - nLineCount));
4143+
}
4144+
else
4145+
{
4146+
// If measure have not happened at this point after adding / removing items,
4147+
// m_lineCount can go lesser than nLineCount as m_lineCount only gets set during measure,
4148+
// We only need to consider cumulatedChildDim in that case. A measure would be happening at a later point
4149+
// which should give the correct extent value.
4150+
extent = cumulatedChildDim;
4151+
}
4152+
}
4153+
else
4154+
{
4155+
extent = (DOUBLE) (cumulatedChildDim + cumulatedChildDim / nLineCount * (m_lineCount - nLineCount));
4156+
}
41344157
extent = extent * zoomFactor;
41354158
}
41364159

src/eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@
22
<!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
33
<Dependencies>
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.8.0-20250906.2.release">
5+
<Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.8.0-20251104.0.release">
66
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
7-
<Sha>79d1cfc26537a731ed0683d02fcea17eb2a00230</Sha>
7+
<Sha>87995f7c3e6fc8d2b68eb744ecc7664211d1de82</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.8.0-stable-27108.1004.250905-1130.6">
9+
<Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.8.0-stable-27108.1016.251103-2135.0">
1010
<Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
11-
<Sha>7c259ec8cfff11d1082ac93517b01f745de66460</Sha>
11+
<Sha>7c6aabdecdc2b713ad2eebc28f89f7768b9cadfe</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.8.0-stable-27108.1004.250905-1130.6">
13+
<Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.8.0-stable-27108.1016.251103-2135.0">
1414
<Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
15-
<Sha>7c259ec8cfff11d1082ac93517b01f745de66460</Sha>
15+
<Sha>7c6aabdecdc2b713ad2eebc28f89f7768b9cadfe</Sha>
1616
</Dependency>
1717
<!-- Microsoft-WinUI-SDK subdirectory in WindowsAppSDKClosed (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.) -->
1818
<Dependency Name="Microsoft.Build.Msix" Version="1.7.0-release.20241114.0">
1919
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
2020
<Sha>bebdf37da96fd9d4c4a6588a8000ceee880cd373</Sha>
2121
</Dependency>
2222
<!-- Closed source binary (ex PTLS and WinUIEdit) -->
23-
<Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.810.0-stable.20250906.0">
23+
<Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.810.0-stable.20251104.3">
2424
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
25-
<Sha>50f523b11c6749c792c6d081c217b5da2ac6683a</Sha>
25+
<Sha>62641e69715904272ae98c31c528db4742e9756c</Sha>
2626
</Dependency>
2727
<Dependency Name="Microsoft.WindowsAppSDK.Base" Version="1.8.250831001">
2828
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator</Uri>
2929
<Sha>094e50346aa0f06f3cb5e8fc0299849db6d00709</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.WindowsAppSDK.Foundation" Version="1.8.250906002">
31+
<Dependency Name="Microsoft.WindowsAppSDK.Foundation" Version="1.8.251104000">
3232
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
33-
<Sha>79d1cfc26537a731ed0683d02fcea17eb2a00230</Sha>
33+
<Sha>87995f7c3e6fc8d2b68eb744ecc7664211d1de82</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="1.8.250906004">
35+
<Dependency Name="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="1.8.251104001">
3636
<Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
37-
<Sha>7c259ec8cfff11d1082ac93517b01f745de66460</Sha>
37+
<Sha>7c6aabdecdc2b713ad2eebc28f89f7768b9cadfe</Sha>
3838
</Dependency>
3939
</ProductDependencies>
4040
<ToolsetDependencies>

0 commit comments

Comments
 (0)