diff --git a/src/UpdateMockWinAppSDKPackage.csproj b/src/UpdateMockWinAppSDKPackage.csproj index 57766e5b74..2506c5bea8 100644 --- a/src/UpdateMockWinAppSDKPackage.csproj +++ b/src/UpdateMockWinAppSDKPackage.csproj @@ -30,42 +30,70 @@ + + + $([System.IO.Path]::GetFullPath("$(OutDir)UpdateMockWinAppSDKPackage\")) + $(ProjectRoot)PackageStore\Microsoft.WindowsAppSDK.999.0.0-mock-$(WinUIVersion)-$(Platform)-$(Configuration).nupkg + - + + + + + + + + - + $(ProjectRoot)packages\ $(OutDir)packages\ - Microsoft.Windows.SDK.BuildTools - $(TempPackagesDirectory)$(MicrosoftWindowsSDKBuildToolsPackageName).$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion) - Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion) - microsoft.windowsappsdk\$(WindowsAppSdkPackageVersion) $(ProjectRoot)scripts\buildMockWinAppSdkPackage.ps1 $(ProjectRoot) $(Platform) $(Configuration) $(WinUIVersion) 999.0.0-mock $(TempPackagesDirectory) - - - - - true - - + + + Microsoft.Windows.SDK.BuildTools + $(TempPackagesDirectory)$(MicrosoftWindowsSDKBuildToolsPackageName).$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion) + Microsoft.Web.WebView2 + $(TempPackagesDirectory)$(WebView2PackageName).$(WebView2Version) + + - - + + + + + true + + + + + + Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion) + microsoft.windowsappsdk\$(WindowsAppSdkPackageVersion) + + + + @@ -91,6 +119,23 @@ + + + + + + + + + + + + + + + + @@ -109,6 +154,7 @@ + \ No newline at end of file diff --git a/src/UpdateMockWinAppSDKPackageBeforeBuilding.props b/src/UpdateMockWinAppSDKPackageBeforeBuilding.props new file mode 100644 index 0000000000..21334af296 --- /dev/null +++ b/src/UpdateMockWinAppSDKPackageBeforeBuilding.props @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/controls/dev/AnimatedIcon/TestUI/AnimatedIconHost.cs b/src/controls/dev/AnimatedIcon/TestUI/AnimatedIconHost.cs index f8a4b6d140..1269ec5a67 100644 --- a/src/controls/dev/AnimatedIcon/TestUI/AnimatedIconHost.cs +++ b/src/controls/dev/AnimatedIcon/TestUI/AnimatedIconHost.cs @@ -16,7 +16,7 @@ namespace MUXControlsTestApp { - public sealed class AnimatedIconHost : Button + public sealed partial class AnimatedIconHost : Button { Border m_iconPresenter; TextBlock m_transitionTextBlock; diff --git a/src/controls/dev/AnimatedIcon/TestUI/BrightnessSun.cs b/src/controls/dev/AnimatedIcon/TestUI/BrightnessSun.cs index 18e00819b0..fd9e58dea2 100644 --- a/src/controls/dev/AnimatedIcon/TestUI/BrightnessSun.cs +++ b/src/controls/dev/AnimatedIcon/TestUI/BrightnessSun.cs @@ -57,7 +57,7 @@ namespace AnimatedVisuals // Frame rate: 25 fps // Frame count: 40 // Duration: 1600.0 mS - sealed class BrightnessSun + sealed partial class BrightnessSun : Microsoft.UI.Xaml.Controls.IAnimatedVisualSource, Microsoft.UI.Xaml.Controls.IAnimatedVisualSource2 { // Animation duration: 1.600 seconds. @@ -127,7 +127,7 @@ public void SetScalarProperty(string propertyName, double value) { } - sealed class BrightnessSun_AnimatedVisual : Microsoft.UI.Xaml.Controls.IAnimatedVisual + sealed partial class BrightnessSun_AnimatedVisual : Microsoft.UI.Xaml.Controls.IAnimatedVisual { const long c_durationTicks = 16000000; readonly Compositor _c; diff --git a/src/controls/dev/AnimatedIcon/TestUI/ColorToSolidColorBrushConverter.cs b/src/controls/dev/AnimatedIcon/TestUI/ColorToSolidColorBrushConverter.cs index b5507b3337..39ed1f8961 100644 --- a/src/controls/dev/AnimatedIcon/TestUI/ColorToSolidColorBrushConverter.cs +++ b/src/controls/dev/AnimatedIcon/TestUI/ColorToSolidColorBrushConverter.cs @@ -7,7 +7,7 @@ namespace MUXControlsTestApp { - class ColorToSolidColorBrushConverter : IValueConverter + partial class ColorToSolidColorBrushConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/controls/dev/AnimatedIcon/TestUI/DoubleToStringConverter.cs b/src/controls/dev/AnimatedIcon/TestUI/DoubleToStringConverter.cs index e461a52ee4..5511093a9f 100644 --- a/src/controls/dev/AnimatedIcon/TestUI/DoubleToStringConverter.cs +++ b/src/controls/dev/AnimatedIcon/TestUI/DoubleToStringConverter.cs @@ -5,7 +5,7 @@ namespace MUXControlsTestApp { - class DoubleToStringConverter : IValueConverter + partial class DoubleToStringConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/controls/dev/AnimatedIcon/TestUI/MockIRichAnimatedIconSource.cs b/src/controls/dev/AnimatedIcon/TestUI/MockIRichAnimatedIconSource.cs index 5a1881584d..ed57817d28 100644 --- a/src/controls/dev/AnimatedIcon/TestUI/MockIRichAnimatedIconSource.cs +++ b/src/controls/dev/AnimatedIcon/TestUI/MockIRichAnimatedIconSource.cs @@ -8,7 +8,7 @@ namespace MUXControlsTestApp { - class MockIAnimatedIconSource2 : IAnimatedVisualSource2 + partial class MockIAnimatedIconSource2 : IAnimatedVisualSource2 { Dictionary markers = new Dictionary(); diff --git a/src/controls/dev/AnimatedIcon/TestUI/ToggleAnimatedIconHost.cs b/src/controls/dev/AnimatedIcon/TestUI/ToggleAnimatedIconHost.cs index 66d20cb453..60f1fa2b4a 100644 --- a/src/controls/dev/AnimatedIcon/TestUI/ToggleAnimatedIconHost.cs +++ b/src/controls/dev/AnimatedIcon/TestUI/ToggleAnimatedIconHost.cs @@ -16,7 +16,7 @@ namespace MUXControlsTestApp { - public sealed class ToggleAnimatedIconHost : CheckBox + public sealed partial class ToggleAnimatedIconHost : CheckBox { Border m_iconPresenter; TextBlock m_transitionTextBlock; diff --git a/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp b/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp index 6b643b4a3c..89823452e5 100644 --- a/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp +++ b/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp @@ -323,17 +323,22 @@ AnimatedVisualPlayer::AnimatedVisualPlayer() // Subscribe to suspending, resuming, and visibility events so we can pause the animation if it's // definitely not visible. - m_suspendingRevoker = winrt::Application::Current().Suspending(winrt::auto_revoke, [weakThis{ get_weak() }]( + // Previously we used get_weak() here, but we found the potential to hit a + // refcounting problem where in some scenarios the outer object gets + // an extra Release() in this process. + auto weakThis {winrt::make_weak(static_cast(*this))}; + m_suspendingRevoker = winrt::Application::Current().Suspending(winrt::auto_revoke, [weakThis]( auto const& /*sender*/, auto const& /*e*/) { if (auto strongThis = weakThis.get()) { - strongThis->OnHiding(); + AnimatedVisualPlayer* rawThis = winrt::get_self(strongThis); + rawThis->OnHiding(); } }); - m_resumingRevoker = winrt::Application::Current().Resuming(winrt::auto_revoke, [weakThis{ get_weak() }]( + m_resumingRevoker = winrt::Application::Current().Resuming(winrt::auto_revoke, [weakThis]( auto const& /*sender*/, auto const& /*e*/) { @@ -341,7 +346,8 @@ AnimatedVisualPlayer::AnimatedVisualPlayer() { if (winrt::CoreWindow::GetForCurrentThread().Visible()) { - strongThis->OnUnhiding(); + AnimatedVisualPlayer* rawThis = winrt::get_self(strongThis); + rawThis->OnUnhiding(); } } }); @@ -398,27 +404,31 @@ void AnimatedVisualPlayer::OnLoaded(winrt::IInspectable const& /*sender*/, winrt m_isUnloaded = false; } - - m_xamlRootChangedRevoker = this->XamlRoot().Changed(winrt::auto_revoke, [weakThis{ get_weak() }]( + // Previously we used get_weak() here, but we found the potential to hit a + // refcounting problem where in some scenarios the outer object gets + // an extra Release() in this process. + auto weakThis {winrt::make_weak(static_cast(*this))}; + m_xamlRootChangedRevoker = this->XamlRoot().Changed(winrt::auto_revoke, [weakThis]( auto const& /*sender*/, auto const& args) { if (auto strongThis = weakThis.get()) { - auto xamlRoot = strongThis->XamlRoot(); + AnimatedVisualPlayer* rawThis = winrt::get_self(strongThis); + auto xamlRoot = rawThis->XamlRoot(); bool hostVisibility = xamlRoot.IsHostVisible(); - if (hostVisibility != strongThis->m_isHostVisible) + if (hostVisibility != rawThis->m_isHostVisible) { - strongThis->m_isHostVisible = hostVisibility; + rawThis->m_isHostVisible = hostVisibility; if (hostVisibility) { // Transition from invisible to visible. - strongThis->OnUnhiding(); + rawThis->OnUnhiding(); } else { // Transition from visible to invisible. - strongThis->OnHiding(); + rawThis->OnHiding(); } } @@ -832,29 +842,35 @@ void AnimatedVisualPlayer::DestroyAnimations() { // Call RequestCommit to make sure that previous compositor calls complete before destroying animations. // RequestCommitAsync is available only for RS4+ + // Previously we used get_weak() here, but we found the potential to hit a + // refcounting problem where in some scenarios the outer object gets + // an extra Release() in this process. + auto weakThis {winrt::make_weak(static_cast(*this))}; m_rootVisual.Compositor().RequestCommitAsync().Completed( - [me_weak = get_weak(), createAnimationsCounter = m_createAnimationsCounter](auto, auto) { - auto me = me_weak.get(); + [weakThis, createAnimationsCounter = m_createAnimationsCounter](auto, auto) { + auto strongThis = weakThis.get(); - if (!me) + if (!strongThis) { return; } + AnimatedVisualPlayer* rawThis = winrt::get_self(strongThis); + // Check if there was any CreateAnimations call after DestroyAnimations. // We should not destroy animations in this case, // they will be destroyed by the following DestroyAnimations call. - if (createAnimationsCounter != me->m_createAnimationsCounter) { + if (createAnimationsCounter != rawThis->m_createAnimationsCounter) { return; } // Check if current animated visual supports destroyig animations. - if (const auto& animatedVisual = me->m_animatedVisual.get()) + if (const auto& animatedVisual = rawThis->m_animatedVisual.get()) { if (const auto& animatedVisual2 = animatedVisual.try_as()) { animatedVisual2.DestroyAnimations(); - me->m_isAnimationsCreated = false; + rawThis->m_isAnimationsCreated = false; } } } @@ -884,14 +900,19 @@ void AnimatedVisualPlayer::OnSourcePropertyChanged( if (auto newDynamicSource = newSource.try_as()) { // Connect to the update notifications of the new source. + // Previously we used get_weak() here, but we found the potential to hit a + // refcounting problem where in some scenarios the outer object gets + // an extra Release() in this process. + auto weakThis {winrt::make_weak(static_cast(*this))}; m_dynamicAnimatedVisualInvalidatedRevoker - = newDynamicSource.AnimatedVisualInvalidated(winrt::auto_revoke, [weakThis{ get_weak() }]( + = newDynamicSource.AnimatedVisualInvalidated(winrt::auto_revoke, [weakThis]( auto const& /*sender*/, auto const& /*e*/) { if (auto strongThis = weakThis.get()) { - strongThis->UpdateContent(); + AnimatedVisualPlayer* rawThis = winrt::get_self(strongThis); + rawThis->UpdateContent(); } }); } diff --git a/src/controls/dev/AnimatedVisualPlayer/TestUI/AnimatedVisualPlayerPage.xaml.cs b/src/controls/dev/AnimatedVisualPlayer/TestUI/AnimatedVisualPlayerPage.xaml.cs index 2824c4e8a5..a3c67b6ed3 100644 --- a/src/controls/dev/AnimatedVisualPlayer/TestUI/AnimatedVisualPlayerPage.xaml.cs +++ b/src/controls/dev/AnimatedVisualPlayer/TestUI/AnimatedVisualPlayerPage.xaml.cs @@ -20,7 +20,7 @@ namespace MUXControlsTestApp { - public class FallbackGrid : Microsoft.UI.Xaml.Controls.Grid + public partial class FallbackGrid : Microsoft.UI.Xaml.Controls.Grid { internal const int RectangleWidth = 100; internal const int RectangleHeight = 100; diff --git a/src/controls/dev/AnimatedVisualPlayer/TestUI/LottieLogo.cs b/src/controls/dev/AnimatedVisualPlayer/TestUI/LottieLogo.cs index 111250f64f..bdf900dd8e 100644 --- a/src/controls/dev/AnimatedVisualPlayer/TestUI/LottieLogo.cs +++ b/src/controls/dev/AnimatedVisualPlayer/TestUI/LottieLogo.cs @@ -59,7 +59,7 @@ namespace AnimatedVisuals // Frame rate: 30 fps // Frame count: 179 // Duration: 5966.7 mS - public sealed class LottieLogo + public sealed partial class LottieLogo : Microsoft.UI.Xaml.Controls.IAnimatedVisualSource { // Animation duration: 5.967 seconds. @@ -131,7 +131,7 @@ public void SetScalarProperty(string propertyName, double value) { } - sealed class LottieLogo_AnimatedVisual : Microsoft.UI.Xaml.Controls.IAnimatedVisual2 + sealed partial class LottieLogo_AnimatedVisual : Microsoft.UI.Xaml.Controls.IAnimatedVisual2 { const long c_durationTicks = 59666666; readonly Compositor _c; diff --git a/src/controls/dev/AnimatedVisualPlayer/TestUI/nullsource.cs b/src/controls/dev/AnimatedVisualPlayer/TestUI/nullsource.cs index 9b6b53baff..8bccc7bfa8 100644 --- a/src/controls/dev/AnimatedVisualPlayer/TestUI/nullsource.cs +++ b/src/controls/dev/AnimatedVisualPlayer/TestUI/nullsource.cs @@ -8,7 +8,7 @@ namespace AnimatedVisuals { // An IAnimatedVisualSource that always fails to create an animated visual. // Used for testing of the fallback path in AnimatedVisualPlayer. - sealed class Nullsource : IAnimatedVisualSource + sealed partial class Nullsource : IAnimatedVisualSource { public IAnimatedVisual TryCreateAnimatedVisual(Compositor compositor, out object diagnostics) { diff --git a/src/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp b/src/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp index 6d7f768a1b..68eb3f7e42 100644 --- a/src/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp +++ b/src/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp @@ -299,7 +299,10 @@ void AnnotatedScrollBar::QueueLayoutLabels(unsigned int millisecondWait) if (!m_labelsDebounce.test_and_set()) { - auto weakThis = get_weak(); + // Previously we used get_weak() here, but we found the potential to hit a + // refcounting problem where in some scenarios the outer object gets + // an extra Release() in this process. + auto weakThis {winrt::make_weak(static_cast(*this))}; auto runLayoutLabelsAction = [weakThis]() { if (winrt::WindowsXamlManager::GetForCurrentThread() == nullptr) @@ -310,8 +313,9 @@ void AnnotatedScrollBar::QueueLayoutLabels(unsigned int millisecondWait) if (auto strongThis = weakThis.get()) { - strongThis->m_labelsDebounce.clear(); - strongThis->LayoutLabels(); + AnnotatedScrollBar* rawThis = winrt::get_self(strongThis); + rawThis->m_labelsDebounce.clear(); + rawThis->LayoutLabels(); } }; diff --git a/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs b/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs index 08c7e37433..e47aa7cdc0 100644 --- a/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs +++ b/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs @@ -305,6 +305,7 @@ public void LabelsGrowToAccomodateLongText() } [TestMethod] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void CollidingLabelsAreRemoved() { Log.Comment("AnnotatedScrollBar CollidingLabelsAreRemoved Test"); diff --git a/src/controls/dev/Breadcrumb/Strings/am-ET/Resources.resw b/src/controls/dev/Breadcrumb/Strings/am-ET/Resources.resw index a4b686a6c4..31fbcb6e8a 100644 --- a/src/controls/dev/Breadcrumb/Strings/am-ET/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/am-ET/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - የበለጠ + ተጨማሪ The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/az-Latn-AZ/Resources.resw b/src/controls/dev/Breadcrumb/Strings/az-Latn-AZ/Resources.resw index f70a8c4f7c..de5029ddb8 100644 --- a/src/controls/dev/Breadcrumb/Strings/az-Latn-AZ/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/az-Latn-AZ/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Davamı + Daha çox The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/cy-gb/resources.resw b/src/controls/dev/Breadcrumb/Strings/cy-gb/resources.resw index fb96b97cbe..ee297669fe 100644 --- a/src/controls/dev/Breadcrumb/Strings/cy-gb/resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/cy-gb/resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Rhagor + Mwy The automation name for the BreadcrumbBar ellipsis button. - eitem bar briwsion + eitem bar briwsion bara A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/da-DK/Resources.resw b/src/controls/dev/Breadcrumb/Strings/da-DK/Resources.resw index af0f250bdd..f36f240020 100644 --- a/src/controls/dev/Breadcrumb/Strings/da-DK/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/da-DK/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Mere + Flere The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/et-EE/Resources.resw b/src/controls/dev/Breadcrumb/Strings/et-EE/Resources.resw index ece18e68a6..3719e371f9 100644 --- a/src/controls/dev/Breadcrumb/Strings/et-EE/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/et-EE/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - Lingirea riba + Aadressiriba üksus A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/fa-IR/Resources.resw b/src/controls/dev/Breadcrumb/Strings/fa-IR/Resources.resw index 346b72686e..549120dae9 100644 --- a/src/controls/dev/Breadcrumb/Strings/fa-IR/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/fa-IR/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - موارد بیشتر + بیشتر The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/fil-PH/Resources.resw b/src/controls/dev/Breadcrumb/Strings/fil-PH/Resources.resw index 531e4a403f..79153bb64c 100644 --- a/src/controls/dev/Breadcrumb/Strings/fil-PH/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/fil-PH/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Marami pa + Higit pa The automation name for the BreadcrumbBar ellipsis button. - item ng breadcrumb bar + item ng adres bar A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/fr-CA/Resources.resw b/src/controls/dev/Breadcrumb/Strings/fr-CA/Resources.resw index 3927495691..4c48470d91 100644 --- a/src/controls/dev/Breadcrumb/Strings/fr-CA/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/fr-CA/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Plus + Autres The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/fr-FR/Resources.resw b/src/controls/dev/Breadcrumb/Strings/fr-FR/Resources.resw index 3927495691..4c48470d91 100644 --- a/src/controls/dev/Breadcrumb/Strings/fr-FR/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/fr-FR/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Plus + Autres The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/ga-IE/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ga-IE/Resources.resw index eb6c0c24c5..d3d84c7b6c 100644 --- a/src/controls/dev/Breadcrumb/Strings/ga-IE/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ga-IE/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - mír bharra grabhróige + mír bharra seoltaí A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/hi-IN/Resources.resw b/src/controls/dev/Breadcrumb/Strings/hi-IN/Resources.resw index 3bd8b82501..0e25bb391b 100644 --- a/src/controls/dev/Breadcrumb/Strings/hi-IN/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/hi-IN/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - पता पट्टी आइटम + breadcrumb bar आइटम A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/hr-HR/Resources.resw b/src/controls/dev/Breadcrumb/Strings/hr-HR/Resources.resw index 8d3a88291b..7af3e11f19 100644 --- a/src/controls/dev/Breadcrumb/Strings/hr-HR/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/hr-HR/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - stavka hijerarhijska trake + stavka adresne trake A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/hy-AM/Resources.resw b/src/controls/dev/Breadcrumb/Strings/hy-AM/Resources.resw index 3d79194278..a3ed5ebcee 100644 --- a/src/controls/dev/Breadcrumb/Strings/hy-AM/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/hy-AM/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Ավելին + Ավելի The automation name for the BreadcrumbBar ellipsis button. - հասցեագոտու տարր + հասցեագոտու միավոր A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/is-IS/Resources.resw b/src/controls/dev/Breadcrumb/Strings/is-IS/Resources.resw index 79afcf56dc..fd0cabd901 100644 --- a/src/controls/dev/Breadcrumb/Strings/is-IS/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/is-IS/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - Atriði á brauðmylsnustiku + Atriði á veffangastiku A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/ja-JP/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ja-JP/Resources.resw index 188141073d..a06401c064 100644 --- a/src/controls/dev/Breadcrumb/Strings/ja-JP/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ja-JP/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 詳細 + その他 The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/km-KH/Resources.resw b/src/controls/dev/Breadcrumb/Strings/km-KH/Resources.resw index 0fe9fea907..0c9f7e893a 100644 --- a/src/controls/dev/Breadcrumb/Strings/km-KH/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/km-KH/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ច្រើន​ទៀត + ច្រើនទៀត The automation name for the BreadcrumbBar ellipsis button. - ធាតុរបារ​ដាន​ទីតាំង + ធាតុរបារអាសយដ្ឋាន A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/kn-IN/Resources.resw b/src/controls/dev/Breadcrumb/Strings/kn-IN/Resources.resw index 97edf64ef8..28b1fe24b8 100644 --- a/src/controls/dev/Breadcrumb/Strings/kn-IN/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/kn-IN/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ಮತ್ತಷ್ಟು + ಇನ್ನಷ್ಟು The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/ko-KR/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ko-KR/Resources.resw index fe435d55a3..aaa68c3344 100644 --- a/src/controls/dev/Breadcrumb/Strings/ko-KR/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ko-KR/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 기타 + 더 보기 The automation name for the BreadcrumbBar ellipsis button. - 이동 경로 막대 항목 + 이동 경로 탐색 막대 항목 A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/lo-LA/Resources.resw b/src/controls/dev/Breadcrumb/Strings/lo-LA/Resources.resw index a8a2d64b62..4437a634f2 100644 --- a/src/controls/dev/Breadcrumb/Strings/lo-LA/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/lo-LA/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ເພີ່ມ​ເຕີມ + ເພີ່ມເຕີມ The automation name for the BreadcrumbBar ellipsis button. - ລາຍການແຖບສ່ວນຂໍ້ມູນທີ່ເຊື່ອມໂຍງກັນ + ລາຍການແຖບທີ່ຢູ່ເວັບໄຊ A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/lt-LT/Resources.resw b/src/controls/dev/Breadcrumb/Strings/lt-LT/Resources.resw index 5a82cea2dc..7b8cd1cc6e 100644 --- a/src/controls/dev/Breadcrumb/Strings/lt-LT/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/lt-LT/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - naršymo juostos elementas + adreso juostos elementas A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/lv-LV/Resources.resw b/src/controls/dev/Breadcrumb/Strings/lv-LV/Resources.resw index 8f6e63b543..336ed32c16 100644 --- a/src/controls/dev/Breadcrumb/Strings/lv-LV/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/lv-LV/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Vēl + Vairāk The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/mi-NZ/Resources.resw b/src/controls/dev/Breadcrumb/Strings/mi-NZ/Resources.resw index a0498bfff2..ea86336abc 100644 --- a/src/controls/dev/Breadcrumb/Strings/mi-NZ/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/mi-NZ/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Ētahi atu mea + Ētahi Atu The automation name for the BreadcrumbBar ellipsis button. - tuemi pae wāhitau + tūemi pae wāhitau A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/ml-IN/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ml-IN/Resources.resw index 385776f64a..054fa955f3 100644 --- a/src/controls/dev/Breadcrumb/Strings/ml-IN/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ml-IN/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - കൂടുതല്‍ + കൂടുതൽ The automation name for the BreadcrumbBar ellipsis button. - ബ്രഡ്‌ക്രമ്പ് ബാർ ഇനം + വിലാസ ബാര്‍ ഇനം A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/ms-MY/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ms-MY/Resources.resw index a095769115..c88f44ccdd 100644 --- a/src/controls/dev/Breadcrumb/Strings/ms-MY/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ms-MY/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Selanjutnya + Lagi The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/mt-MT/Resources.resw b/src/controls/dev/Breadcrumb/Strings/mt-MT/Resources.resw index 961d0022d5..2a6075270b 100644 --- a/src/controls/dev/Breadcrumb/Strings/mt-MT/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/mt-MT/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - item tal-istrixxa tal-breadcrumb + element tal-istrixxa tal-indirizzi A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/quz-PE/Resources.resw b/src/controls/dev/Breadcrumb/Strings/quz-PE/Resources.resw index 17938d23ce..4e223b02e3 100644 --- a/src/controls/dev/Breadcrumb/Strings/quz-PE/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/quz-PE/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - breadcrumb kutmunpa imankuna + Taqwimuna kutmu item A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/ro-RO/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ro-RO/Resources.resw index 305571875d..55008e615a 100644 --- a/src/controls/dev/Breadcrumb/Strings/ro-RO/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ro-RO/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - element bară de adrese + element în bara Adrese A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/ru-RU/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ru-RU/Resources.resw index 716175df93..85b478aaca 100644 --- a/src/controls/dev/Breadcrumb/Strings/ru-RU/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ru-RU/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Дополнительно + Еще The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/sk-SK/Resources.resw b/src/controls/dev/Breadcrumb/Strings/sk-SK/Resources.resw index 77437c4c9f..6b1445d207 100644 --- a/src/controls/dev/Breadcrumb/Strings/sk-SK/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/sk-SK/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - Položka panela s adresou + položka panela s adresou A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/sq-AL/Resources.resw b/src/controls/dev/Breadcrumb/Strings/sq-AL/Resources.resw index 298b9da218..724a85aa98 100644 --- a/src/controls/dev/Breadcrumb/Strings/sq-AL/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/sq-AL/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - elementi i shiritit të copëzave të informacionit + njësia e shiritit të adresës A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-BA/Resources.resw b/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-BA/Resources.resw index cafc817220..c9e7dd7f9d 100644 --- a/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-BA/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-BA/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - ставка траке са путањом + ставка траке адреса A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-RS/Resources.resw b/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-RS/Resources.resw index c9e7dd7f9d..91d6320744 100644 --- a/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-RS/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/sr-Cyrl-RS/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Више + Још The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/ta-IN/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ta-IN/Resources.resw index fd65fded75..d2871ce494 100644 --- a/src/controls/dev/Breadcrumb/Strings/ta-IN/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ta-IN/Resources.resw @@ -122,7 +122,7 @@ The automation name for the BreadcrumbBar ellipsis button. - மேலதிகச்செலுத்தல்பட்டி உருப்படி + ப்ரெட்க்ரம்ப் பட்டி உருப்படி A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/ug-CN/Resources.resw b/src/controls/dev/Breadcrumb/Strings/ug-CN/Resources.resw index fc0ad5662f..caa39e6ddf 100644 --- a/src/controls/dev/Breadcrumb/Strings/ug-CN/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/ug-CN/Resources.resw @@ -118,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - كۆپرەك + باشقىلار The automation name for the BreadcrumbBar ellipsis button. - Breadcrumb بالدىقى ئوبيېكتى + يېتەكلىگۈچ بالدىقى ئوبيېكتى A simple description of the control for UIA \ No newline at end of file diff --git a/src/controls/dev/Breadcrumb/Strings/vi-VN/Resources.resw b/src/controls/dev/Breadcrumb/Strings/vi-VN/Resources.resw index 16ab0db857..59f5232f8f 100644 --- a/src/controls/dev/Breadcrumb/Strings/vi-VN/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/vi-VN/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Thêm + Xem thêm The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/Breadcrumb/Strings/zh-TW/Resources.resw b/src/controls/dev/Breadcrumb/Strings/zh-TW/Resources.resw index 2fde2cfd38..f9d67a435e 100644 --- a/src/controls/dev/Breadcrumb/Strings/zh-TW/Resources.resw +++ b/src/controls/dev/Breadcrumb/Strings/zh-TW/Resources.resw @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 更多資訊 + 其他 The automation name for the BreadcrumbBar ellipsis button. diff --git a/src/controls/dev/ColorPicker/TestUI/ColorPickerPage.xaml.cs b/src/controls/dev/ColorPicker/TestUI/ColorPickerPage.xaml.cs index 86120def42..170b618a34 100644 --- a/src/controls/dev/ColorPicker/TestUI/ColorPickerPage.xaml.cs +++ b/src/controls/dev/ColorPicker/TestUI/ColorPickerPage.xaml.cs @@ -389,7 +389,7 @@ private void OrientationComboBox_SelectionChanged(object sender, SelectionChange } } - public class MyColorSpectrum : ColorSpectrum + public partial class MyColorSpectrum : ColorSpectrum { protected override void OnApplyTemplate() { diff --git a/src/controls/dev/ComboBox/APITests/ComboBoxTests.cs b/src/controls/dev/ComboBox/APITests/ComboBoxTests.cs index 5bc3d16005..1867ee3d3e 100644 --- a/src/controls/dev/ComboBox/APITests/ComboBoxTests.cs +++ b/src/controls/dev/ComboBox/APITests/ComboBoxTests.cs @@ -75,6 +75,7 @@ public void VerifyComboBoxEditModeCornerRadius() } [TestMethod] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void VerifyVisualTree() { var comboBox = SetupComboBox(useContent: false); diff --git a/src/controls/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs b/src/controls/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs index 1e5529c312..35de6ec450 100644 --- a/src/controls/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs +++ b/src/controls/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs @@ -84,6 +84,7 @@ public void ExecuteAndWaitForEvents(Action action, IList eventTexts) [TestMethod] [TestProperty("TestSuite", "A")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void CanTapOnPrimaryItems() { using (var setup = new CommandBarFlyoutTestSetupHelper()) @@ -108,6 +109,7 @@ public void CanTapOnPrimaryItems() [TestMethod] [TestProperty("TestSuite", "A")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void CanTapOnSecondaryItems() { using (var setup = new CommandBarFlyoutTestSetupHelper()) @@ -200,6 +202,7 @@ public void CanTapOnSecondaryItemWithFlyoutWithoutClosing() [TestMethod] [TestProperty("TestSuite", "A")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void VerifyTabNavigationBetweenPrimaryAndSecondaryCommands() { using (var setup = new CommandBarFlyoutTestSetupHelper()) @@ -231,6 +234,7 @@ public void VerifyTabNavigationBetweenPrimaryAndSecondaryCommands() [TestMethod] [TestProperty("TestSuite", "A")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void VerifyLeftAndRightNavigationBetweenPrimaryCommands() { VerifyLeftAndRightNavigationBetweenPrimaryCommands(inRTL: false, useUpDownKeys: false); @@ -246,6 +250,7 @@ public void VerifyLeftAndRightNavigationBetweenPrimaryCommandsRTL() [TestMethod] [TestProperty("TestSuite", "A")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void VerifyLeftAndRightNavigationBetweenPrimaryCommandsUpAndDown() { VerifyLeftAndRightNavigationBetweenPrimaryCommands(inRTL: false, useUpDownKeys: true); @@ -352,6 +357,7 @@ private void VerifyLeftAndRightNavigationBetweenPrimaryCommands(bool inRTL, bool [TestMethod] [TestProperty("TestSuite", "A")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void VerifyUpAndDownNavigationBetweenPrimaryAndSecondaryCommands() { using (var setup = new CommandBarFlyoutTestSetupHelper()) @@ -448,6 +454,7 @@ public void VerifyUpAndDownNavigationBetweenPrimaryAndSecondaryCommands() [TestMethod] [TestProperty("TestSuite", "A")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void VerifyPrimaryCommandsAutomationSet() { using (var setup = new CommandBarFlyoutTestSetupHelper()) @@ -583,6 +590,7 @@ public void VerifyFlowsToAndFromIsNotSetWithoutPrimaryCommands() [TestMethod] [TestProperty("TestSuite", "B")] + [TestProperty("TestPass:MaxOSVer", WindowsOSVersion._22H2)] // This test is currently failing on 23h2. public void VerifyFlyoutClosingBehavior() { using (var setup = new CommandBarFlyoutTestSetupHelper()) diff --git a/src/controls/dev/CommonStyles/APITests/CommonStylesTests.cs b/src/controls/dev/CommonStyles/APITests/CommonStylesTests.cs index f62bfd54b3..dbd4ff52ec 100644 --- a/src/controls/dev/CommonStyles/APITests/CommonStylesTests.cs +++ b/src/controls/dev/CommonStyles/APITests/CommonStylesTests.cs @@ -254,6 +254,7 @@ public void CornerRadiusFilterConverterTest() // https://github.com/microsoft/microsoft-ui-xaml/issues/4320 // Task 30789390: Re-enable AppBarToggleButton disabled test [TestMethod] + [TestProperty("TestPass:MaxOSVer", "22621")] // This test is currently failing on 23h2, hence stop at 22h2 which is 22621. public void VerifyVisualTreeForControlsInCommonStyles() { var controlsToVerify = new List { @@ -285,6 +286,7 @@ public void VerifyVisualTreeForControlsInCommonStyles() } [TestMethod] + [TestProperty("TestPass:MaxOSVer", "22621")] // This test is currently failing on 23h2, hence stop at 22h2 which is 22621. public void VerifyVisualTreeForCommandBarCornerRadius() { var xaml = @@ -314,6 +316,7 @@ public void VerifyVisualTreeForCommandBarCornerRadius() } [TestMethod] + [TestProperty("TestPass:MaxOSVer", "22621")] // This test is currently failing on 23h2, hence stop at 22h2 which is 22621. public void VerifyVisualTreeForCommandBarOverflowMenu() { StackPanel root = null; @@ -532,6 +535,7 @@ public class CommonStylesVisualTreeTestSamples { [TestMethod] [TestProperty("TestPass:IncludeOnlyOn", "Desktop")] // The default theme is different on OneCore, leading to a test failure. + [TestProperty("TestPass:MaxOSVer", "22621")] // This test is currently failing on 23h2, hence stop at 22h2 which is 22621. public void VerifyVisualTreeForAppBarAndAppBarToggleButton() { var xaml = @" @@ -581,6 +585,7 @@ public void VerifyVisualTreeExampleForLightTheme() [TestMethod] // [TestProperty("TestPass:IncludeOnlyOn", "Desktop")] // The default theme is different on OneCore, leading to a test failure. + [TestProperty("TestPass:MaxOSVer", "22621")] // This test is currently failing on 23h2, hence stop at 22h2 which is 22621. public void VerifyVisualTreeExampleWithCustomerFilter() { var xaml = @" diff --git a/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs b/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs index 8eea8eece8..b1ec55bdcd 100644 --- a/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs +++ b/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs @@ -122,7 +122,8 @@ private void RunDensityTests(string buttonName) } } - [TestMethod] + [TestMethod] + [TestProperty("TestPass:MaxOSVer", "22621")] // This test is currently failing on 23h2, hence stop at 22h2 which is 22621. public void RunCompactTests() { using (var setup = new TestSetupHelper("Compact Tests")) @@ -168,6 +169,7 @@ public void InkToolbarTest() } [TestMethod] + [TestProperty("TestPass:MaxOSVer", "22621")] // This test is currently failing on 23h2, hence stop at 22h2 which is 22621. public void MenuFlyoutItemSizeTest() { using (var setup = new TestSetupHelper("MenuFlyout Tests")) diff --git a/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml b/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml index 98d6a8d601..f0461cc572 100644 --- a/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml +++ b/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml @@ -70,7 +70,7 @@ @@ -111,46 +111,58 @@ - - + + + + + + + + + + None Non-focusable Focusable - - + None Non-focusable Focusable - + - - + Disabled Enabled Auto -