Skip to content

Commit 16a9110

Browse files
author
reunion-maestro-bot
committed
Syncing content from committish ce9823232f6a58e811521b6a3d5dbe9158033f22
1 parent 29c220a commit 16a9110

File tree

4 files changed

+36
-12
lines changed

4 files changed

+36
-12
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 59890418: [1.7 Servicing][WASDK][Watson Failure] caused by STOWED_EXCEPTION_80070057_Microsoft.UI.Xaml.dll!CDirectManipulationService::SetContentBounds
30+
#define WINAPPSDK_CHANGEID_59890418 59890418, WinAppSDK_1_7_6
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_59890418>())
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
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.7.0-20251008.0.release">
5+
<Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.7.0-20251105.0.release">
66
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
7-
<Sha>872b8405cb72c799ac69233e0a66a256eb4fde24</Sha>
7+
<Sha>d8529f8d4ff802e91da1a760cc90f4646649061d</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.7.4-stable-27107.1026.250929-0815.1">
9+
<Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.7.4-stable-27107.1034.251104-0700.0">
1010
<Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
11-
<Sha>ce065e8c04cb9d2fd6f8485f931fcac90aacc3c3</Sha>
11+
<Sha>7c6aabdecdc2b713ad2eebc28f89f7768b9cadfe</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.7.4-stable-27107.1026.250929-0815.1">
13+
<Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.7.4-stable-27107.1034.251104-0700.0">
1414
<Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
15-
<Sha>ce065e8c04cb9d2fd6f8485f931fcac90aacc3c3</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.) -->
18-
<Dependency Name="Microsoft.Build.Msix" Version="1.7.0-release.20250914.0">
18+
<Dependency Name="Microsoft.Build.Msix" Version="1.7.0-release.20251104.4">
1919
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
20-
<Sha>421511c7e306569a10bd03def51e172ad6a6f02f</Sha>
20+
<Sha>6094b8f4cf1a4c83b7c31f4f08637b575ee4593c</Sha>
2121
</Dependency>
2222
<!-- Closed source binary (ex PTLS and WinUIEdit) -->
23-
<Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.710.0-release.20250914.0">
23+
<Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.710.0-release.20251104.4">
2424
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
25-
<Sha>421511c7e306569a10bd03def51e172ad6a6f02f</Sha>
25+
<Sha>6094b8f4cf1a4c83b7c31f4f08637b575ee4593c</Sha>
2626
</Dependency>
2727
</ProductDependencies>
2828
<ToolsetDependencies>

src/eng/versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<IxpTransportPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(VersionDetailsFileContents), 'Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.*?Version="(.*?)"').Groups[1].Value)</IxpTransportPackageVersion>
4343
<IxpInternalPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(VersionDetailsFileContents), 'Microsoft.Internal.InteractiveExperiences.*?Version="(.*?)"').Groups[1].Value)</IxpInternalPackageVersion>
4444
<WinUIDetailsNugetVersion>$([System.Text.RegularExpressions.Regex]::Match($(VersionDetailsFileContents), 'Microsoft.Internal.WinUIDetails.*?Version="(.*?)"').Groups[1].Value)</WinUIDetailsNugetVersion>
45-
<MicrosoftBuildMsixVersion>1.7.0-release.20250914.0</MicrosoftBuildMsixVersion>
45+
<MicrosoftBuildMsixVersion>1.7.0-release.20251104.4</MicrosoftBuildMsixVersion>
4646
<!-- It is at this point that we might want our non-product code to be able to use a package version different than the primary configuration -->
4747
<!-- If so, this would probably be the point at which we would override the above version with what is configured for the app -->
4848
<!-- The package version identifies the targeted package version based on the configured packages. -->

0 commit comments

Comments
 (0)