motimat/Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies (#20139)

Browse Source 
* Update dependencies

* Partially revert appium upgrades

* Fix integration tests
This commit is contained in:
Julien Lebosquain
2025-12-17 15:23:32 +01:00
committed by GitHub
parent 9623669c41
commit ce0a1c6b3e
24 changed files with 88 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Avalonia.Desktop.slnf
+1 -1
View File
@@ -1,4 +1,4 @@
{
{
"solution": {
"path": "Avalonia.sln",
"projects": [
build/AnalyzerProject.targets
+1 -1
View File
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all"/>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.5.0" PrivateAssets="all" />
</ItemGroup>
build/HarfBuzzSharp.props
+3 -3
View File
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="HarfBuzzSharp" Version="8.3.1.1" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.1" />
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.1" />
<PackageReference Include="HarfBuzzSharp" Version="8.3.1.2" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.2" />
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
</ItemGroup>
</Project>
build/ImageSharp.props
+1 -1
View File
@@ -1,5 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.10" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.12" />
</ItemGroup>
</Project>
build/Microsoft.Reactive.Testing.props
+1 -1
View File
@@ -1,5 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.1.0" />
</ItemGroup>
</Project>
build/Rx.props
+1 -1
View File
@@ -1,5 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="System.Reactive" Version="6.0.1" />
<PackageReference Include="System.Reactive" Version="6.1.0" />
</ItemGroup>
</Project>
build/SkiaSharp.props
+3 -3
View File
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="3.119.0" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="3.119.0" />
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.0" />
<PackageReference Include="SkiaSharp" Version="3.119.1" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
</ItemGroup>
</Project>
build/XUnit.props
+9 -9
View File
@@ -1,14 +1,14 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.assert" Version="2.9.2" />
<PackageReference Include="xunit.core" Version="2.9.2" />
<PackageReference Include="xunit.extensibility.core" Version="2.9.2" />
<PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
<PackageReference Include="xunit.runner.console" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.assert" Version="2.9.3" />
<PackageReference Include="xunit.core" Version="2.9.3" />
<PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
<PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
<PackageReference Include="xunit.runner.console" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
<PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
</ItemGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
nukebuild/_build.csproj
+3 -3
View File
@@ -15,9 +15,9 @@
<PackageReference Include="Nuke.Common" Version="9.0.4" />
<PackageReference Include="MicroCom.CodeGenerator" Version="0.11.0" />
<!-- Keep in sync with Avalonia.Build.Tasks -->
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
<PackageReference Include="Microsoft.Build.Framework" Version="17.14.8" PrivateAssets="All" />
<PackageReference Include="NuGet.Protocol" Version="6.14.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.6" />
<PackageReference Include="Microsoft.Build.Framework" Version="18.0.2" PrivateAssets="All" />
<PackageReference Include="NuGet.Protocol" Version="7.0.1" />
<PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[10.0.100]" />
<PackageDownload Include="Microsoft.DotNet.ApiDiff.Tool" Version="[10.0.100-rtm.25531.102]" />
<PackageDownload Include="dotnet-ilrepack" Version="[1.0.0]" />
src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+2 -2
View File
@@ -131,9 +131,9 @@
<Compile Include="../Avalonia.Base/Diagnostics/TrimmingMessages.cs" Link="Diagnostics/TrimmingMessages.cs" />
<Compile Include="../Shared/StringCompatibilityExtensions.cs" Link="Compatibility/StringCompatibilityExtensions.cs" />
<Compile Include="../Shared/IsExternalInit.cs" Link="Compatibility/IsExternalInit.cs" />
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
<PackageReference Include="Mono.Cecil" Version="0.11.6" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Numerics.Vectors" Version="4.6.1" />
</ItemGroup>
<Import Project="../../build/SourceGenerators.props" />
<Import Project="../../build/NullableEnable.props" />
src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
+1 -1
View File
@@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Tmds.DBus.Protocol" Version="0.21.2" />
<PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.21" PrivateAssets="all" />
<PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.22" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj
+10 -2
View File
@@ -6,8 +6,16 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Avalonia.Headless\Avalonia.Headless.csproj" />
<PackageReference Include="Quamotion.RemoteViewing" Version="1.1.179" />
<ProjectReference Include="../Avalonia.Headless/Avalonia.Headless.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Quamotion.RemoteViewing" Version="1.1.211" />
<PackageReference Include="SharpCompress" Version="0.41.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="../../Avalonia.Base/Reactive/Disposable.cs" />
</ItemGroup>
<Import Project="..\..\..\build\DevAnalyzers.props" />
src/Headless/Avalonia.Headless.Vnc/AvaloniaVncLogger.cs
+3 -3
View File
@@ -1,13 +1,13 @@
using System;
using Avalonia.Logging;
using Avalonia.Reactive;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions.Internal;
namespace Avalonia.Headless.Vnc;
internal class AvaloniaVncLogger : ILogger
{
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
{
Logger.TryGet(ToLogEventLevel(logLevel), LogArea.VncPlatform)
?.Log(state, formatter(state,exception));
@@ -20,7 +20,7 @@ internal class AvaloniaVncLogger : ILogger
public IDisposable BeginScope<TState>(TState state)
{
return NullScope.Instance;
return Disposable.Empty;
}
private static LogEventLevel ToLogEventLevel(LogLevel logLevel)
src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+1 -1
View File
@@ -11,7 +11,7 @@
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.257">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
src/Windows/Avalonia.Win32/WinScreen.cs
+4 -3
View File
@@ -60,12 +60,13 @@ internal sealed unsafe class WinScreen(IntPtr hMonitor) : PlatformScreen(new Pla
out var numPathInfo, out var numModeInfo) != WIN32_ERROR.NO_ERROR)
return null;
var paths = stackalloc DISPLAYCONFIG_PATH_INFO[(int)numPathInfo];
var modes = stackalloc DISPLAYCONFIG_MODE_INFO[(int)numModeInfo];
Span<DISPLAYCONFIG_PATH_INFO> paths = stackalloc DISPLAYCONFIG_PATH_INFO[(int)numPathInfo];
Span<DISPLAYCONFIG_MODE_INFO> modes = stackalloc DISPLAYCONFIG_MODE_INFO[(int)numModeInfo];
DISPLAYCONFIG_TOPOLOGY_ID currentTopologyId = default;
if (PInvoke.QueryDisplayConfig(
QUERY_DISPLAY_CONFIG_FLAGS.QDC_ONLY_ACTIVE_PATHS, ref numPathInfo, paths, ref numModeInfo, modes,
default) != WIN32_ERROR.NO_ERROR)
ref currentTopologyId) != WIN32_ERROR.NO_ERROR)
return null;
var sourceName = new DISPLAYCONFIG_SOURCE_DEVICE_NAME();
tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+1 -1
View File
@@ -14,7 +14,7 @@
<ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
<ProjectReference Include="..\..\src\tools\Avalonia.Generators\Avalonia.Generators.csproj" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
tests/Avalonia.Headless.NUnit.PerAssembly.UnitTests/Avalonia.Headless.NUnit.PerAssembly.UnitTests.csproj
+2 -2
View File
@@ -13,8 +13,8 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
</ItemGroup>
<ItemGroup>
tests/Avalonia.Headless.NUnit.PerTest.UnitTests/Avalonia.Headless.NUnit.PerTest.UnitTests.csproj
+2 -2
View File
@@ -13,8 +13,8 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
</ItemGroup>
<ItemGroup>
tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj
+27 -2
View File
@@ -13,9 +13,34 @@
<ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(IsRunningAppium2)' == 'false'">
<PackageReference Include="Appium.WebDriver" Version="4.4.5" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>
<ItemGroup Condition="'$(IsRunningAppium2)' == 'true'">
<PackageReference Include="Appium.WebDriver" Version="5.2.0"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Appium.WebDriver" Version="4.4.0" Condition="'$(IsRunningAppium2)' == 'false'" />
<PackageReference Include="Appium.WebDriver" Version="5.0.0-rc.8" Condition="'$(IsRunningAppium2)' == 'true'" />
<Compile Remove="ButtonTests.cs" />
<Compile Remove="CheckBoxTests.cs" />
<Compile Remove="ContextMenuTests.cs" />
<Compile Remove="EmbeddingTests.cs" />
<Compile Remove="GestureTests.cs" />
<Compile Remove="ListBoxTests.cs" />
<Compile Remove="NativeMenuTests.cs" />
<Compile Remove="PointerTests.cs" />
<Compile Remove="PointerTests_MacOS.cs" />
<Compile Remove="RadioButtonTests.cs" />
<Compile Remove="ScreenTests.cs" />
<Compile Remove="ScrollBarTests.cs" />
<Compile Remove="SliderTests.cs" />
<Compile Remove="TrayIconTests.cs" />
<Compile Remove="WindowDecorationsTests.cs" />
<Compile Remove="WindowTests.cs" />
<Compile Remove="WindowTests_MacOS.cs" />
</ItemGroup>
<Import Project="..\..\build\XUnit.props" />
tests/Avalonia.IntegrationTests.Appium/TestBase.cs
+5
View File
@@ -18,6 +18,11 @@ public class TestBase
var pager = Session.FindElementByAccessibilityId("Pager");
var page = pager.FindElementByName(pageName);
page.Click();
// If the mouse was captured, the first click might have just released the capture, try again
if (!page.Selected)
page.Click();
break;
}
catch (WebDriverException) when (retry++ < 3)
tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+2 -2
View File
@@ -38,11 +38,11 @@
<Compile Include="../Shared/ScopedSanityCheck.cs"/>
</ItemGroup>
<ItemGroup>
<PackageReference Update="xunit.runner.console" Version="2.9.2">
<PackageReference Update="xunit.runner.console" Version="2.9.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Update="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
tests/Avalonia.RenderTests.WpfCompare/Avalonia.RenderTests.WpfCompare.csproj
+1 -1
View File
@@ -15,7 +15,7 @@
<Content Include="../Avalonia.RenderTests/**/*.png" CopyToOutputDirectory="Always" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xunit.StaFact" Version="1.2.46-alpha" />
<PackageReference Include="Xunit.StaFact" Version="1.2.69" />
</ItemGroup>
<Import Project="..\..\build\Moq.props" />
<Import Project="..\..\build\Rx.props" />
tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
+3 -3
View File
@@ -9,9 +9,9 @@
<Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
<Import Project="..\..\build\SharedVersion.props" />
<ItemGroup>
<EmbeddedResource Include="..\Avalonia.RenderTests\*\*.ttf" />
<None Remove="**\*.ttf" />
<EmbeddedResource Include="**\*.ttf" />
<EmbeddedResource Include="..\Avalonia.RenderTests\Assets\**\*.ttf" LinkBase="Assets" />
<None Remove="Fonts\**\*.ttf" />
<EmbeddedResource Include="Fonts\**\*.ttf" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />