From d5c30b6270088aa97c5ebb449d5e63a406bb70f1 Mon Sep 17 00:00:00 2001 From: Julien Lebosquain Date: Mon, 23 Mar 2026 17:52:23 +0100 Subject: [PATCH] Update packages (#20967) * Update MicroCom to 0.11.3 * Update NUnit to 4.5.1 * Update xUnit to 3.2.2 * Update Xamarin.AndroidX packages * Update AvaloniaUI.DiagnosticsSupport to 2.2.0-beta3 * Fix xUnit warnings --- Directory.Packages.props | 24 +++++++++---------- .../Layout/LayoutableTests_LayoutRounding.cs | 4 ++-- .../WindowTests.cs | 12 ++++------ 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9441c68cac..f23004b89f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,7 +7,7 @@ - + @@ -15,9 +15,9 @@ - - - + + + @@ -37,8 +37,8 @@ - - + + @@ -62,16 +62,16 @@ - - - + + + - - + + - + \ No newline at end of file diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs index 866d7cbb75..5a6efdc012 100644 --- a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs +++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs @@ -112,7 +112,7 @@ namespace Avalonia.Base.UnitTests.Layout { if (!expected.NearlyEquals(actual)) { - throw EqualException.ForMismatchedValues(expected, actual); + throw EqualException.ForMismatchedValues(expected.ToString(), actual.ToString()); } } @@ -120,7 +120,7 @@ namespace Avalonia.Base.UnitTests.Layout { if (!expected.NearlyEquals(actual)) { - throw EqualException.ForMismatchedValues(expected, actual); + throw EqualException.ForMismatchedValues(expected.ToString(), actual.ToString()); } } diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs index b6cbf38adf..aa1c675e82 100644 --- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs @@ -459,17 +459,13 @@ namespace Avalonia.IntegrationTests.Appium // WindowStartupLocation needs to be calculated before the window is shown, meaning that // the position of a centered window can be off by a bit. From initial testing, looks // like this shouldn't be more than 10 pixels. - if (Math.Abs(expected.X - actual.X) > 10) - throw EqualException.ForMismatchedValues(expected, actual); - if (Math.Abs(expected.Y - actual.Y) > 10) - throw EqualException.ForMismatchedValues(expected, actual); + Assert.Equal(expected.X, actual.X, 10.0); + Assert.Equal(expected.Y, actual.Y, 10.0); } else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { - if (Math.Abs(expected.X - actual.X) > 15) - throw EqualException.ForMismatchedValues(expected, actual); - if (Math.Abs(expected.Y - actual.Y) > 15) - throw EqualException.ForMismatchedValues(expected, actual); + Assert.Equal(expected.X, actual.X, 15.0); + Assert.Equal(expected.Y, actual.Y, 15.0); } else {