From 2b89eae59ef7b833e59cf1f8791443f9dbdbba47 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Thu, 16 Oct 2025 15:56:36 +0100
Subject: [PATCH 01/16] Update to .NET 10 and C# 14

---
 Directory.Build.props                         |  2 +-
 build/Base.props                              |  6 ++--
 build/TargetFrameworks.props                  | 14 +++++-----
 build/UnitTests.NetCore.targets               |  5 +---
 build/XUnit.props                             |  2 +-
 external/XamlX                                |  2 +-
 global.json                                   |  2 +-
 nukebuild/Build.cs                            |  4 +--
 packages/Avalonia/AvaloniaPrivateApis.targets |  2 +-
 .../ControlCatalog.Android.csproj             |  2 +-
 .../ControlCatalog.Browser.Blazor.csproj      |  4 +--
 samples/Directory.Build.props                 |  2 +-
 samples/XEmbedSample/XEmbedSample.csproj      | 28 +++++++++----------
 .../Avalonia.Android/Avalonia.Android.csproj  |  4 +--
 .../Data/Core/BindingExpression.cs            |  3 ++
 .../Reflection/DynamicPluginStreamNode.cs     |  3 ++
 .../Reflection/ExpressionTreeIndexerNode.cs   |  3 ++
 .../Core/Parsers/BindingExpressionVisitor.cs  |  3 ++
 .../Data/Core/Plugins/BindingPlugins.cs       |  1 +
 .../Plugins/ReflectionMethodAccessorPlugin.cs |  6 ++++
 .../Diagnostics/TrimmingMessages.cs           |  4 +++
 .../Expressions/ExpressionParser.cs           |  2 +-
 src/Avalonia.Base/Utilities/Polyfills.cs      |  6 ++--
 .../Avalonia.Build.Tasks.csproj               |  1 +
 .../AvaloniaNativeGlPlatformGraphics.cs       |  4 ++-
 src/Avalonia.Native/Metal.cs                  |  4 ++-
 .../Avalonia.Remote.Protocol.csproj           |  1 +
 src/Avalonia.Remote.Protocol/MetsysBson.cs    | 14 +++++++++-
 .../Avalonia.Browser.Blazor.csproj            |  2 +-
 .../Avalonia.Markup.Xaml.Loader.csproj        |  5 ++++
 .../AvaloniaXamlIlLanguage.cs                 |  4 +++
 .../AvaloniaXamlIlQueryTransformer.cs         |  4 +++
 .../AvaloniaXamlIlSelectorTransformer.cs      |  3 ++
 .../AvaloniaXamlIlWellKnownTypes.cs           |  2 ++
 .../XamlIlBindingPathHelper.cs                |  8 ++++++
 ...amlIlPropertyInfoAccessorFactoryEmitter.cs |  5 ++++
 .../IncludeXamlIlSre.props                    |  2 +-
 .../ReflectionBindingExtension.cs             |  3 ++
 .../Templates/TreeDataTemplate.cs             |  1 +
 .../XamlIl/Runtime/XamlIlRuntimeHelpers.cs    |  2 +-
 src/Markup/Avalonia.Markup/Data/Binding.cs    |  6 ++++
 .../Markup/Parsers/ExpressionNodeFactory.cs   |  3 ++
 .../WinForms/WinFormsAvaloniaControlHost.cs   |  1 +
 .../Avalonia.Win32/Avalonia.Win32.csproj      |  4 +--
 src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs   |  2 +-
 src/iOS/Avalonia.iOS/IOSLauncher.cs           |  2 +-
 src/iOS/Avalonia.iOS/iOSScreens.cs            |  2 +-
 .../Avalonia.Designer.HostApp.csproj          |  1 +
 .../CompilerDynamicDependenciesGenerator.cs   | 28 +++++++++++++------
 .../Avalonia.Headless.NUnit.UnitTests.csproj  |  2 +-
 .../Avalonia.LeakTests.csproj                 |  2 +-
 .../Avalonia.UnitTests.csproj                 |  2 +-
 52 files changed, 162 insertions(+), 68 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f124456eab1..c6ed387d66a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,7 +8,7 @@
       <!-- https://github.com/dotnet/msbuild/issues/2661 -->
       <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
       <RunApiCompat>False</RunApiCompat>
-      <LangVersion>12</LangVersion>
+      <LangVersion>14.0</LangVersion>
       <CreateHardLinksForCopyAdditionalFilesIfPossible>true</CreateHardLinksForCopyAdditionalFilesIfPossible>
       <CreateHardLinksForCopyFilesToOutputDirectoryIfPossible>true</CreateHardLinksForCopyFilesToOutputDirectoryIfPossible>
       <CreateHardLinksForCopyLocalIfPossible>true</CreateHardLinksForCopyLocalIfPossible>
diff --git a/build/Base.props b/build/Base.props
index 0e667f105b9..1c618dfcd67 100644
--- a/build/Base.props
+++ b/build/Base.props
@@ -1,12 +1,12 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- '!NET6_0_OR_GREATER' equivalent -->
   <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')))">
-    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="System.Memory" Version="4.6.3" />
   </ItemGroup>
   <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')))">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-rc.2.25502.107" />
   </ItemGroup>
   <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0')))">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.0-rc.2.25502.107" />
   </ItemGroup>
 </Project>
diff --git a/build/TargetFrameworks.props b/build/TargetFrameworks.props
index f14a3876fff..4be557a59b3 100644
--- a/build/TargetFrameworks.props
+++ b/build/TargetFrameworks.props
@@ -1,17 +1,17 @@
 <Project>
   <PropertyGroup>
-    <AvsCurrentTargetFramework>net8.0</AvsCurrentTargetFramework>
+    <AvsCurrentTargetFramework>net10.0</AvsCurrentTargetFramework>
     <AvsCurrentWindowsTargetFramework>$(AvsCurrentTargetFramework)-windows</AvsCurrentWindowsTargetFramework>
     <AvsCurrentMacOSTargetFramework>$(AvsCurrentTargetFramework)-macos</AvsCurrentMacOSTargetFramework>
-    <AvsCurrentAndroidTargetFramework>$(AvsCurrentTargetFramework)-android34.0</AvsCurrentAndroidTargetFramework>
-    <AvsCurrentMacCatalystTargetFramework>$(AvsCurrentTargetFramework)-maccatalyst17.0</AvsCurrentMacCatalystTargetFramework>
-    <AvsCurrentIOSTargetFramework>$(AvsCurrentTargetFramework)-ios17.0</AvsCurrentIOSTargetFramework>
-    <AvsCurrentTvOSTargetFramework>$(AvsCurrentTargetFramework)-tvos17.0</AvsCurrentTvOSTargetFramework>
+    <AvsCurrentAndroidTargetFramework>$(AvsCurrentTargetFramework)-android36.0</AvsCurrentAndroidTargetFramework>
+    <AvsCurrentMacCatalystTargetFramework>$(AvsCurrentTargetFramework)-maccatalyst26.0</AvsCurrentMacCatalystTargetFramework>
+    <AvsCurrentIOSTargetFramework>$(AvsCurrentTargetFramework)-ios26.0</AvsCurrentIOSTargetFramework>
+    <AvsCurrentTvOSTargetFramework>$(AvsCurrentTargetFramework)-tvos26.0</AvsCurrentTvOSTargetFramework>
     <AvsCurrentBrowserTargetFramework>$(AvsCurrentTargetFramework)-browser</AvsCurrentBrowserTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(AvsSkipBuildingLegacyTargetFrameworks)' != 'True'">
-    <AvsLegacyTargetFrameworks>net6.0</AvsLegacyTargetFrameworks>
-    <AvsLegacyWindowsTargetFrameworks>net6.0-windows</AvsLegacyWindowsTargetFrameworks>
+    <AvsLegacyTargetFrameworks>net8.0</AvsLegacyTargetFrameworks>
+    <AvsLegacyWindowsTargetFrameworks>net8.0-windows</AvsLegacyWindowsTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/build/UnitTests.NetCore.targets b/build/UnitTests.NetCore.targets
index 42da8e4ab17..19b2253f4ff 100644
--- a/build/UnitTests.NetCore.targets
+++ b/build/UnitTests.NetCore.targets
@@ -3,7 +3,4 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/XUnit.props b/build/XUnit.props
index b4e9708ecde..4b00869d5b6 100644
--- a/build/XUnit.props
+++ b/build/XUnit.props
@@ -8,7 +8,7 @@
     <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="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
   </ItemGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
diff --git a/external/XamlX b/external/XamlX
index 83567b8a50b..99a49740bd6 160000
--- a/external/XamlX
+++ b/external/XamlX
@@ -1 +1 @@
-Subproject commit 83567b8a50bbf612a0b1420a3dc6d8e8ebee2399
+Subproject commit 99a49740bd6a587b1852337764741ec280e201d6
diff --git a/global.json b/global.json
index f496cffc503..7fed696458a 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.411",
+    "version": "10.0.100-rc.2.25502.107",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index b0d8106d325..c7e8b776f76 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -240,11 +240,11 @@ void RunCoreTest(string projectName, Action<string, string> runTest)
             var tfm = fw;
             if (tfm == "$(AvsCurrentTargetFramework)")
             {
-                tfm = "net8.0";
+                tfm = "net10.0";
             }
             if (tfm == "$(AvsLegacyTargetFrameworks)")
             {
-                tfm = "net6.0";
+                tfm = "net8.0";
             }
             
             if (tfm.StartsWith("net4")
diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets
index 5f69187d923..47219535cc9 100644
--- a/packages/Avalonia/AvaloniaPrivateApis.targets
+++ b/packages/Avalonia/AvaloniaPrivateApis.targets
@@ -13,7 +13,7 @@
   </Target>
   <Target Name="AddReferencePathsToRealAvaloniaAssemblies" BeforeTargets="CoreCompile" Condition="'$(AvaloniaAccessUnstablePrivateApis.ToLowerInvariant())'=='true'">
     <PropertyGroup>
-      <AvaloniaUnstableApiFrameworkToUse>net6.0</AvaloniaUnstableApiFrameworkToUse>
+      <AvaloniaUnstableApiFrameworkToUse>net8.0</AvaloniaUnstableApiFrameworkToUse>
       <AvaloniaUnstableApiFrameworkToUse Condition="$(TargetFramework.StartsWith('net4')) == 'true' or $(TargetFramework.StartsWith('net5')) == 'true' or $(TargetFramework.StartsWith('netsta')) == 'true' or $(TargetFramework.StartsWith('netcore')) == 'true'">netstandard2.0</AvaloniaUnstableApiFrameworkToUse>
     </PropertyGroup>
     <ItemGroup>
diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 958725eed5b..f60ba69395e 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.4" />
+    <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.17" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj b/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj
index 2950028e687..763ab26cabf 100644
--- a/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj
+++ b/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.2.25502.107" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index 3a61d3fff97..169239237f1 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -4,7 +4,7 @@
     <IsPackable>false</IsPackable>
     <AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)..\src\tools\Avalonia.Designer.HostApp\bin\Debug\netstandard2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
     <EnableNETAnalyzers>false</EnableNETAnalyzers>
-    <LangVersion>12</LangVersion>
+    <LangVersion>14.0</LangVersion>
     <NoWarn>$(NoWarn);CS8002</NoWarn> <!-- ignore signing warnings for samples -->
   </PropertyGroup>
 
diff --git a/samples/XEmbedSample/XEmbedSample.csproj b/samples/XEmbedSample/XEmbedSample.csproj
index 01ea7432db0..a6e754692db 100644
--- a/samples/XEmbedSample/XEmbedSample.csproj
+++ b/samples/XEmbedSample/XEmbedSample.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="GtkSharp" Version="3.24.24.95" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GtkSharp" Version="3.24.24.95"/>
+  </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
-      <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj"/>
+    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj"/>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index 2fb849ee0de..4dc8d3113e3 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.5" />
-    <PackageReference Include="Xamarin.AndroidX.Window" Version="1.3.0.5" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Window" Version="1.4.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
diff --git a/src/Avalonia.Base/Data/Core/BindingExpression.cs b/src/Avalonia.Base/Data/Core/BindingExpression.cs
index ca29dd6ffa4..a51ee5bf8a5 100644
--- a/src/Avalonia.Base/Data/Core/BindingExpression.cs
+++ b/src/Avalonia.Base/Data/Core/BindingExpression.cs
@@ -190,6 +190,9 @@ public override void UpdateTarget()
     /// <param name="targetNullValue">The null target value.</param>
     /// <param name="allowReflection">Whether to allow reflection for target type conversion.</param>
     [RequiresUnreferencedCode(TrimmingMessages.ExpressionNodeRequiresUnreferencedCodeMessage)]
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
     internal static BindingExpression Create<TIn, TOut>(
         TIn source,
         Expression<Func<TIn, TOut>> expression,
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs
index f6c692e6859..dd8c0e1a63d 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs
@@ -7,6 +7,9 @@
 namespace Avalonia.Data.Core.ExpressionNodes.Reflection;
 
 [RequiresUnreferencedCode(TrimmingMessages.ExpressionNodeRequiresUnreferencedCodeMessage)]
+#if NET8_0_OR_GREATER
+[RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
 internal sealed class DynamicPluginStreamNode : ExpressionNode
 {
     private IDisposable? _subscription;
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ExpressionTreeIndexerNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ExpressionTreeIndexerNode.cs
index e720aa6e693..dfb83fb10d9 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ExpressionTreeIndexerNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ExpressionTreeIndexerNode.cs
@@ -16,6 +16,9 @@ internal sealed class ExpressionTreeIndexerNode : CollectionNodeBase, ISettableN
     private readonly Delegate _getDelegate;
     private readonly Delegate _firstArgumentDelegate;
 
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
     public ExpressionTreeIndexerNode(IndexExpression expression)
     {
         var valueParameter = Expression.Parameter(expression.Type);
diff --git a/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs b/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs
index 39d6ffcab66..19817321451 100644
--- a/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs
@@ -11,6 +11,9 @@
 namespace Avalonia.Data.Core.Parsers;
 
 [RequiresUnreferencedCode(TrimmingMessages.ExpressionNodeRequiresUnreferencedCodeMessage)]
+#if NET8_0_OR_GREATER
+[RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
 internal class BindingExpressionVisitor<TIn> : ExpressionVisitor
 {
     private static readonly PropertyInfo AvaloniaObjectIndexer;
diff --git a/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs b/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
index 5c2d9aaddf5..520c345ad5f 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
@@ -28,6 +28,7 @@ public static class BindingPlugins
             new ObservableStreamPlugin(),
         };
 
+        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "We're checking if dynamic code is supported.")]
         static BindingPlugins()
         {
             // When building with AOT, don't create ReflectionMethodAccessorPlugin instance.
diff --git a/src/Avalonia.Base/Data/Core/Plugins/ReflectionMethodAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/ReflectionMethodAccessorPlugin.cs
index e295fc60669..f9a4587ca63 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/ReflectionMethodAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ReflectionMethodAccessorPlugin.cs
@@ -7,6 +7,9 @@
 namespace Avalonia.Data.Core.Plugins
 {
     [RequiresUnreferencedCode(TrimmingMessages.PropertyAccessorsRequiresUnreferencedCodeMessage)]
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
     internal class ReflectionMethodAccessorPlugin : IPropertyAccessorPlugin
     {
         private readonly Dictionary<(Type, string), MethodInfo?> _methodLookup =
@@ -81,6 +84,9 @@ internal class ReflectionMethodAccessorPlugin : IPropertyAccessorPlugin
             return found;
         }
 
+#if NET8_0_OR_GREATER
+        [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
         private sealed class Accessor : PropertyAccessorBase
         {
             public Accessor(WeakReference<object?> reference, MethodInfo method)
diff --git a/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs b/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs
index ce9c9e187b7..930ff4202bc 100644
--- a/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs
+++ b/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs
@@ -9,11 +9,13 @@ internal static class TrimmingMessages
     public const string TypeConversionRequiresUnreferencedCodeMessage = "Conversion methods are required for type conversion, including op_Implicit, op_Explicit, Parse and TypeConverter.";
 
     public const string ReflectionBindingRequiresUnreferencedCodeMessage = "BindingExpression and ReflectionBinding heavily use reflection. Consider using CompiledBindings instead.";
+    public const string ReflectionBindingRequiresDynamicCodeMessage = "BindingExpression and ReflectionBinding require dynamic code. Consider using CompiledBindings instead.";
     public const string ReflectionBindingSupressWarningMessage = "BindingExpression and ReflectionBinding internal heavily use reflection.";
 
     public const string CompiledBindingSafeSupressWarningMessage = "CompiledBinding preserves members used in the expression tree.";
 
     public const string ExpressionNodeRequiresUnreferencedCodeMessage = "ExpressionNode might require unreferenced code.";
+    public const string ExpressionNodeRequiresDynamicCodeMessage = "ExpressionNode requires dynamic code.";
     public const string ExpressionSafeSupressWarningMessage = "Typed Expressions preserves members used in the expression tree.";
 
     public const string SelectorsParseRequiresUnreferencedCodeMessage = "Selectors runtime parser might require unreferenced code. Consider using stronly typed selectors factory with 'new Style(s => s.OfType<Button>())' syntax.";
@@ -28,4 +30,6 @@ internal static class TrimmingMessages
 
     public const string IgnoreNativeAotSupressWarningMessage = "This method is not supported by NativeAOT.";
     public const string DesignTimeSupressWarningMessage = "This method is design time only.";
+
+    public const string TypesInCoreOrAvaloniaAssembly = "The types reside in the core assembly or in an explicitly loaded Avalonia assembly and will always be found.";
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
index ce3d89a6700..885499bc2cf 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
@@ -145,7 +145,7 @@ public void AppendWithOperator(Expression expr, ExpressionType op)
             };
 
             private static readonly ExpressionType[][] OperatorPrecedenceGroupsReversed =
-                OperatorPrecedenceGroups.Reverse().ToArray();
+                OperatorPrecedenceGroups.AsEnumerable().Reverse().ToArray();
 
             // a*b+c [a,b,c] [*,+], call with (0, 2)
             // ToExpression(a*b) + ToExpression(c)
diff --git a/src/Avalonia.Base/Utilities/Polyfills.cs b/src/Avalonia.Base/Utilities/Polyfills.cs
index 6a30bfcf93a..9ee72ab112f 100644
--- a/src/Avalonia.Base/Utilities/Polyfills.cs
+++ b/src/Avalonia.Base/Utilities/Polyfills.cs
@@ -33,11 +33,11 @@ internal sealed class UnscopedRefAttribute : Attribute
     
     struct S
     {
-        int field; 
+        int _field;
 
         // Okay: `field` has the ref-safe-to-escape of `this` which is *calling method* because 
         // it is a `ref`
-        [UnscopedRef] ref int Prop1 => ref field;
+        [UnscopedRef] ref int Prop1 => ref _field;
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
index fd2c8e59e54..92677735b19 100644
--- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
@@ -128,6 +128,7 @@
       <Compile Include="../Avalonia.Base/Compatibility/NullableAttributes.cs" Link="Compatibility/NullableAttributes.cs" />
       <Compile Include="../Avalonia.Base/Compatibility/TrimmingAttributes.cs" Link="Compatibility/TrimmingAttributes.cs" />
       <Compile Include="../Avalonia.Base/Utilities/SpanHelpers.cs" Link="Utilities/SpanHelpers.cs" />
+      <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" />
diff --git a/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs b/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs
index d5787533de0..ae5abf26554 100644
--- a/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs
+++ b/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs
@@ -236,7 +236,9 @@ public unsafe GlExternalObjectsFeature(GlContext context, GlDisplay display)
             if (context.Context.GetIOKitRegistryId(&registryId) != 0)
             {
                 // We are reversing bytes to match MoltenVK (LUID is a Vulkan term after all)
-                DeviceLuid = BitConverter.GetBytes(registryId).Reverse().ToArray();
+                var bytes = BitConverter.GetBytes(registryId);
+                bytes.Reverse();
+                DeviceLuid = bytes;
             }
         }
 
diff --git a/src/Avalonia.Native/Metal.cs b/src/Avalonia.Native/Metal.cs
index 804f63c4f7b..6c5f6331a89 100644
--- a/src/Avalonia.Native/Metal.cs
+++ b/src/Avalonia.Native/Metal.cs
@@ -93,7 +93,9 @@ public unsafe MetalExternalObjectsFeature(IAvnMetalDevice device)
         ulong registryId;
         if (_device.GetIOKitRegistryId(&registryId) != 0)
         {
-            DeviceLuid = BitConverter.GetBytes(registryId).Reverse().ToArray();
+            var bytes = BitConverter.GetBytes(registryId);
+            bytes.Reverse();
+            DeviceLuid = bytes;
         }
     }
 
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index cedff2955db..0c8a0580f6f 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -6,6 +6,7 @@
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\Avalonia.Base\Diagnostics\TrimmingMessages.cs" />
     <Compile Include="..\Avalonia.Base\Input\Key.cs" />
     <Compile Include="..\Avalonia.Base\Input\PhysicalKey.cs" />
     <Compile Include="..\Avalonia.Base\Compatibility\TrimmingAttributes.cs" Visible="False" />
diff --git a/src/Avalonia.Remote.Protocol/MetsysBson.cs b/src/Avalonia.Remote.Protocol/MetsysBson.cs
index 01071a7b37b..6e5c3223ca6 100644
--- a/src/Avalonia.Remote.Protocol/MetsysBson.cs
+++ b/src/Avalonia.Remote.Protocol/MetsysBson.cs
@@ -38,10 +38,10 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
 using System.Linq.Expressions;
 using System.Net;
 using System.Reflection;
-using System.Runtime.Serialization;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
+using Avalonia;
 using Metsys.Bson.Configuration;
 // ReSharper disable All
 
@@ -1422,6 +1422,9 @@ public interface ITypeConfiguration<T>
         ITypeConfiguration<T> IgnoreIfNull(Expression<Func<T, object>> expression);
     }
 
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
     internal class TypeConfiguration<T> : ITypeConfiguration<T>
     {
         private readonly BsonConfiguration _configuration;
@@ -1461,6 +1464,9 @@ public ITypeConfiguration<T> IgnoreIfNull(Expression<Func<T, object>> expression
 
 namespace Metsys.Bson.Configuration
 {
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
     public static class ExpressionHelper
     {
         public static string GetName(this MemberExpression expression)
@@ -1493,6 +1499,9 @@ public static MemberExpression GetMemberExpression<T, TValue>(this Expression<Fu
             return null;
         }
 
+#if NET8_0_OR_GREATER
+        [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
         private class ExpressionNameVisitor
         {
             public string Visit(Expression expression)
@@ -1580,6 +1589,9 @@ internal static BsonConfiguration Instance
 
         private BsonConfiguration() { }
 
+#if NET8_0_OR_GREATER
+        [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
         public static void ForType<T>(Action<ITypeConfiguration<T>> action)
         {
             action(new TypeConfiguration<T>(Instance));
diff --git a/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj b/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
index 5bba4917120..4b6a4649d5f 100644
--- a/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
+++ b/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
@@ -14,7 +14,7 @@
   <Import Project="../../../build/TrimmingEnable.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-rc.2.25502.107" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
index 20403d00bfd..804b4188a5b 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
@@ -6,10 +6,15 @@
     <IsAotCompatible>false</IsAotCompatible>
     <DefineConstants>$(DefineConstants);XAMLX_INTERNAL;XAML_RUNTIME_LOADER</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="../../Avalonia.Base/Diagnostics/TrimmingMessages.cs" Link="Diagnostics/AvaloniaTrimmingMessages.cs" />
+  </ItemGroup>
+
   <Import Project="IncludeXamlIlSre.props" />
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\TrimmingEnable.props" />
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
index 4f4e407690c..06f49bdf262 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
@@ -19,6 +19,7 @@ ONLY use types from netstandard and XamlIl. NO dependencies on Avalonia are allo
     
     class AvaloniaXamlIlLanguage
     {
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         public static (XamlLanguageTypeMappings language, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emit) Configure(IXamlTypeSystem typeSystem)
         {
             var runtimeHelpers = typeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.XamlIlRuntimeHelpers");
@@ -83,6 +84,7 @@ public static (XamlLanguageTypeMappings language, XamlLanguageEmitMappings<IXaml
 
         public const string ContextNameScopeFieldName = "AvaloniaNameScope";
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         private static void EmitNameScopeField(
             XamlLanguageTypeMappings mappings,
             IXamlTypeSystem typeSystem,
@@ -100,6 +102,7 @@ private static void EmitNameScopeField(
                 .Stfld(field);
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         private static void EmitEagerParentStackProvider(
             XamlLanguageTypeMappings mappings,
             IXamlTypeSystem typeSystem,
@@ -170,6 +173,7 @@ class AttributeResolver : IXamlCustomAttributeResolver
             private readonly IXamlType _avaloniaListConverter;
 
 
+            [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
             public AttributeResolver(IXamlTypeSystem typeSystem, XamlLanguageTypeMappings mappings)
             {
                 _typeConverterAttribute = mappings.TypeConverterAttributes.First();
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlQueryTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlQueryTransformer.cs
index f376934e163..40680323760 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlQueryTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlQueryTransformer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Avalonia.Markup.Parsers;
 using Avalonia.Styling;
@@ -134,6 +135,7 @@ public virtual XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILN
         
         protected abstract void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen);
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         protected void EmitCall(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen, Func<IXamlMethod, bool> method)
         {
             var queries = context.Configuration.TypeSystem.GetType("Avalonia.Styling.StyleQueries");
@@ -307,6 +309,7 @@ public override IXamlType? TargetType
             }
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             if (_queries.Count == 0)
@@ -385,6 +388,7 @@ public override IXamlType? TargetType
             }
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             if (_queries.Count == 0)
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
index e0d234e6df3..d37cffc3609 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using Avalonia.Markup.Parsers;
@@ -307,6 +308,7 @@ public virtual XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILN
         
         protected abstract void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen);
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         protected void EmitCall(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen, Func<IXamlMethod, bool> method)
         {
             var selectors = context.Configuration.TypeSystem.GetType("Avalonia.Styling.Selectors");
@@ -550,6 +552,7 @@ public override IXamlType? TargetType
             }
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             if (_selectors.Count == 0)
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
index cab4716aa3d..0aa9814e176 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -143,6 +143,7 @@ sealed internal class InteractivityWellKnownTypes
             public IXamlMethod AddHandler { get; }
             public IXamlMethod AddHandlerT { get; }
 
+            [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
             internal InteractivityWellKnownTypes(TransformerConfiguration cfg)
             {
                 var ts = cfg.TypeSystem;
@@ -176,6 +177,7 @@ internal InteractivityWellKnownTypes(TransformerConfiguration cfg)
 
         public InteractivityWellKnownTypes Interactivity { get; }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
         {
             RuntimeHelpers = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.XamlIlRuntimeHelpers");
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
index cfb9c11ad5b..fdf3dffd0ed 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection.Emit;
 using Avalonia.Markup.Parsers;
@@ -137,6 +138,7 @@ private static XamlIlBindingPathNode TransformForTargetTyping(XamlIlBindingPathN
             return node.Property.Getter?.ReturnType;
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         private static XamlIlBindingPathNode TransformBindingPath(AstTransformationContext context, IXamlLineInfo lineInfo, Func<IXamlType> startTypeResolver, IXamlType selfType, IEnumerable<BindingExpressionGrammar.INode> bindingExpression)
         {
             List<IXamlIlBindingPathElementNode> transformNodes = new List<IXamlIlBindingPathElementNode>();
@@ -743,6 +745,8 @@ public XamlIlClrMethodPathElementNode(IXamlMethod method, IXamlType systemDelega
 
             public IXamlType Type { get; }
 
+            [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
+            [UnconditionalSuppressMessage("Trimming", "IL2062", Justification = "All Action<> and Func<> types are explicitly preserved.")]
             public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
             {
                 IXamlTypeBuilder<IXamlILEmitter>? newDelegateTypeBuilder = null;
@@ -824,6 +828,7 @@ public XamlIlClrMethodAsCommandPathElementNode(
 
             public IXamlType Type { get; }
 
+            [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
             public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
             {
                 var trampolineBuilder = context.Configuration.GetExtra<XamlIlTrampolineBuilder>();
@@ -894,6 +899,7 @@ public XamlIlClrIndexerPathElementNode(IXamlProperty property, List<IXamlAstValu
                 _isNotifyingCollection = isNotifyingCollection;
             }
 
+            [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
             public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
             {
                 var intType = context.Configuration.TypeSystem.GetType("System.Int32");
@@ -940,6 +946,7 @@ public XamlIlArrayIndexerPathElementNode(IXamlType arrayType, IList<string> valu
                 }
             }
 
+            [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
             public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
             {
                 var intType = context.Configuration.TypeSystem.GetType("System.Int32");
@@ -1002,6 +1009,7 @@ public XamlIlBindingPathNode(IXamlLineInfo lineInfo,
 
             public List<IXamlIlBindingPathElementNode> Elements { get; }
 
+            [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
             public XamlILNodeEmitResult Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
             {
                 var intType = context.Configuration.TypeSystem.GetType("System.Int32");
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlPropertyInfoAccessorFactoryEmitter.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlPropertyInfoAccessorFactoryEmitter.cs
index bc51aea039a..58cae92cf33 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlPropertyInfoAccessorFactoryEmitter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlPropertyInfoAccessorFactoryEmitter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
@@ -37,6 +38,7 @@ public IXamlType EmitLoadAvaloniaPropertyAccessorFactory(XamlIlEmitContext conte
             return EmitCreateAccessorFactoryDelegate(context, codeGen);
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         private void EmitLoadPropertyAccessorFactory(XamlIlEmitContext context, IXamlILEmitter codeGen, IXamlType type, string accessorFactoryName, bool isStatic = true)
         {
             var types = context.GetAvaloniaTypes();
@@ -48,6 +50,7 @@ private void EmitLoadPropertyAccessorFactory(XamlIlEmitContext context, IXamlILE
             codeGen.Ldftn(type.GetMethod(accessorFactorySignature));
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         public IXamlType EmitLoadIndexerAccessorFactory(XamlIlEmitContext context, IXamlILEmitter codeGen, IXamlAstValueNode value)
         {
             var intType = context.Configuration.TypeSystem.GetType("System.Int32");
@@ -62,6 +65,7 @@ public IXamlType EmitLoadIndexerAccessorFactory(XamlIlEmitContext context, IXaml
             return EmitCreateAccessorFactoryDelegate(context, codeGen);
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         private IXamlType InitializeClosureType(XamlIlEmitContext context)
         {
             var types = context.GetAvaloniaTypes();
@@ -101,6 +105,7 @@ private IXamlType InitializeClosureType(XamlIlEmitContext context)
             return _indexerClosureTypeBuilder.CreateType();
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2122", Justification = TrimmingMessages.TypesInCoreOrAvaloniaAssembly)]
         private IXamlType EmitCreateAccessorFactoryDelegate(XamlIlEmitContext context, IXamlILEmitter codeGen)
         {
             var types = context.GetAvaloniaTypes();
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props b/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props
index 9efb6cd416e..8e2a82e47aa 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props
@@ -11,6 +11,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')))">
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ReflectionBindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ReflectionBindingExtension.cs
index 312477ef027..c1f2f001f3e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ReflectionBindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ReflectionBindingExtension.cs
@@ -9,6 +9,9 @@
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
     [RequiresUnreferencedCode(TrimmingMessages.ReflectionBindingRequiresUnreferencedCodeMessage)]
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ReflectionBindingRequiresDynamicCodeMessage)]
+#endif
     public class ReflectionBindingExtension
     {
         public ReflectionBindingExtension()
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
index 9f34bf20254..96e1bc96f02 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -35,6 +35,7 @@ public bool Match(object? data)
         }
 
         [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "If ItemsSource is a CompiledBinding, then path members will be preserved")]
+        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Dynamic code should be available if reflection bindings are used")]
         public InstancedBinding? ItemsSelector(object item)
         {
             if (ItemsSource != null)
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
index 5b86116106b..0047adc9935 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
@@ -241,7 +241,7 @@ public object IntermediateRootObject
                 => RootObject;
 
             public IEnumerable<object> Parents
-                => _parentResourceNodes.Reverse();
+                => _parentResourceNodes.AsEnumerable().Reverse();
 
             public IReadOnlyList<object> DirectParentsStack
                 => _parentResourceNodes;
diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
index 5d1f3c22a09..1578177bfcd 100644
--- a/src/Markup/Avalonia.Markup/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -16,6 +16,9 @@ namespace Avalonia.Data
     /// A XAML binding.
     /// </summary>
     [RequiresUnreferencedCode(TrimmingMessages.ReflectionBindingRequiresUnreferencedCodeMessage)]
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ReflectionBindingRequiresDynamicCodeMessage)]
+#endif
     public class Binding : BindingBase
     {
         /// <summary>
@@ -90,6 +93,9 @@ private protected override BindingExpressionBase Instance(
         /// ITreeDataTemplate in time for 11.0. We should revisit this in 12.0.
         /// </remarks>
         // TODO12: Refactor
+#if NET8_0_OR_GREATER
+    [RequiresDynamicCode(TrimmingMessages.ExpressionNodeRequiresDynamicCodeMessage)]
+#endif
         internal BindingExpression CreateObservableForTreeDataTemplate(object source)
         {
             if (!string.IsNullOrEmpty(ElementName))
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionNodeFactory.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionNodeFactory.cs
index 28250de0213..59794ceb922 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionNodeFactory.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionNodeFactory.cs
@@ -15,6 +15,9 @@ namespace Avalonia.Markup.Parsers
     internal static class ExpressionNodeFactory
     {
         [RequiresUnreferencedCode(TrimmingMessages.ReflectionBindingRequiresUnreferencedCodeMessage)]
+#if NET8_0_OR_GREATER
+        [RequiresDynamicCode(TrimmingMessages.ReflectionBindingRequiresDynamicCodeMessage)]
+#endif
         public static List<ExpressionNode>? CreateFromAst(
             List<BindingExpressionGrammar.INode> astNodes,
             Func<string?, string, Type>? typeResolver,
diff --git a/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs b/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
index 44e9c85d2e4..bca66ad6a3c 100644
--- a/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
@@ -32,6 +32,7 @@ public WinFormsAvaloniaControlHost()
     /// <summary>
     /// Gets or sets the Avalonia control hosted by the <see cref="WinFormsAvaloniaControlHost"/> element.
     /// </summary>
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public AvControl? Content
     {
         get => _content;
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 8836f307d96..508ab224d76 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -7,8 +7,8 @@
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.6.1" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
diff --git a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
index 36788426be9..2618dad857e 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
@@ -40,7 +40,7 @@ event EventHandler<ActivatedEventArgs> IAvaloniaAppDelegate.Deactivated
         public UIWindow? Window { get; set; }
 
         [Export("application:didFinishLaunchingWithOptions:")]
-        public bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
+        public bool FinishedLaunching(UIApplication application, NSDictionary? launchOptions)
         {
             var builder = CreateAppBuilder();
             builder = CustomizeAppBuilder(builder);
diff --git a/src/iOS/Avalonia.iOS/IOSLauncher.cs b/src/iOS/Avalonia.iOS/IOSLauncher.cs
index e77092292c6..f836a75006d 100644
--- a/src/iOS/Avalonia.iOS/IOSLauncher.cs
+++ b/src/iOS/Avalonia.iOS/IOSLauncher.cs
@@ -12,7 +12,7 @@ public Task<bool> LaunchUriAsync(Uri uri)
     {
         _ = uri ?? throw new ArgumentNullException(nameof(uri));
 
-        if (uri.IsAbsoluteUri && UIApplication.SharedApplication.CanOpenUrl(uri))
+        if (uri.IsAbsoluteUri && UIApplication.SharedApplication.CanOpenUrl(uri!))
         {
             return UIApplication.SharedApplication.OpenUrlAsync(uri!, new UIApplicationOpenUrlOptions());
         }
diff --git a/src/iOS/Avalonia.iOS/iOSScreens.cs b/src/iOS/Avalonia.iOS/iOSScreens.cs
index 85d298466df..149fdf961a4 100644
--- a/src/iOS/Avalonia.iOS/iOSScreens.cs
+++ b/src/iOS/Avalonia.iOS/iOSScreens.cs
@@ -69,7 +69,7 @@ public iOSScreens()
 
     protected override Screen? ScreenFromTopLevelCore(ITopLevelImpl topLevel)
     {
-        var uiScreen = (topLevel as AvaloniaView.TopLevelImpl)?.View.Window.Screen;
+        var uiScreen = (topLevel as AvaloniaView.TopLevelImpl)?.View.Window?.Screen;
         return uiScreen is not null && TryGetScreen(uiScreen, out var screen) ? screen : null;
     }
 }
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index e4f78f304fd..0e5e4f70a74 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -16,6 +16,7 @@
     <Compile Include="..\..\..\src\Markup\Avalonia.Markup.Xaml.Loader\CompilerDynamicDependencies.cs" />
     <Compile Include="..\..\..\src\Avalonia.Base\Compatibility\NullableAttributes.cs" Link="Compatibility\NullableAttributes.cs" />
     <Compile Include="..\..\..\src\Avalonia.Base\Compatibility\TrimmingAttributes.cs" Link="Compatibility\TrimmingAttributes.cs" />
+    <Compile Include="..\..\..\src\Avalonia.Base\Diagnostics\TrimmingMessages.cs" Link="Diagnostics/AvaloniaTrimmingMessages.cs" />
     <Compile Include="..\..\Shared\StringCompatibilityExtensions.cs" Link="Compatibility\StringCompatibilityExtensions.cs" />
     <Compile Include="..\..\..\src\Shared\IsExternalInit.cs" Link="Compatibility\IsExternalInit.cs" />
   </ItemGroup>
diff --git a/src/tools/DevGenerators/CompilerDynamicDependenciesGenerator.cs b/src/tools/DevGenerators/CompilerDynamicDependenciesGenerator.cs
index 3838dc7bef0..c9008c8aefc 100644
--- a/src/tools/DevGenerators/CompilerDynamicDependenciesGenerator.cs
+++ b/src/tools/DevGenerators/CompilerDynamicDependenciesGenerator.cs
@@ -1,4 +1,7 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -21,15 +24,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         context.RegisterSourceOutput(invocationSyntaxes.Collect(), static (context, invocations) =>
         {
             var types = invocations
-                .Select(t => t.ArgumentList.Arguments[0].GetText().ToString())
+                .Select(t => t.ArgumentList.Arguments[0].GetText().ToString().Trim('"'))
+                .Append("System.Action")
+                .Concat(Enumerable.Range(1, 16).Select(i => $"System.Action`{i}"))
+                .Concat(Enumerable.Range(1, 17).Select(i => $"System.Func`{i}"))
                 .Distinct()
-                .Select(t => t
-                    .Replace("\"", "")
-                    .Replace("`1", "<>")
-                    .Replace("`2", "<,>")
-                    .Replace("`3", "<,,>")
-                    .Replace("`4", "<,,,>"))
-                .OrderBy(t => t)
+                .Select(ToCSharpTypeName)
+                .OrderBy(t => t, StringComparer.Ordinal)
                 .ToArray();
             if (types.Length == 0)
             {
@@ -74,4 +75,13 @@ public CompilerDynamicDependenciesAttribute() {}
             context.AddSource("CompilerDynamicDependenciesAttribute.generated.cs", attributesBuilder.ToString());
         });
     }
+
+    private static string ToCSharpTypeName(string clrTypeName)
+    {
+        var index = clrTypeName.LastIndexOf('`');
+        if (index < 0 || !int.TryParse(clrTypeName.Substring(index + 1), NumberStyles.None, CultureInfo.InvariantCulture, out var argCount))
+            return clrTypeName;
+
+        return $"{clrTypeName.Substring(0, index)}<{new string(',', argCount - 1)}>";
+    }
 }
diff --git a/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj b/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj
index 301b96e0e85..ce7f01c66d7 100644
--- a/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj
+++ b/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj
@@ -14,7 +14,7 @@
   <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="Microsoft.NET.Test.Sdk" Version="18.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index 20179ac8b9f..ca5e262c107 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462</TargetFrameworks>
+    <TargetFrameworks>$(AvsCurrentTargetFramework)</TargetFrameworks>
   </PropertyGroup>
   <Import Project="..\..\build\JetBrains.dotMemoryUnit.props" />
   <Import Project="..\..\build\Moq.props" />
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index 0d49f78dd9e..2d740f28074 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>$(AvsCurrentTargetFramework);net47</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputType>Library</OutputType>
     <IsPackable>false</IsPackable>

From 4f0fb93495462e3eecf864935b95f45c1037c58c Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Fri, 17 Oct 2025 19:06:06 +0200
Subject: [PATCH 02/16] Remove reflection usage in AvaloniaAccessHelper

---
 .../Avalonia.Android/AvaloniaAccessHelper.cs  | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs b/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
index 0b5a7e03c41..d4026b6fa96 100644
--- a/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
+++ b/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using Android.Content.PM;
 using Android.OS;
 using AndroidX.Core.View.Accessibility;
 using AndroidX.CustomView.Widget;
@@ -15,20 +13,6 @@ namespace Avalonia.Android
 {
     internal class AvaloniaAccessHelper : ExploreByTouchHelper
     {
-        private const string AUTOMATION_PROVIDER_NAMESPACE = "Avalonia.Automation.Provider";
-
-        private static readonly IReadOnlyDictionary<string, NodeInfoProviderInitializer>
-            s_providerTypeInitializers = new Dictionary<string, NodeInfoProviderInitializer>()
-            {
-                { typeof(IExpandCollapseProvider).FullName!, (owner, peer, id) => new ExpandCollapseNodeInfoProvider(owner, peer, id) },
-                { typeof(IInvokeProvider).FullName!, (owner, peer, id) => new InvokeNodeInfoProvider(owner, peer, id) },
-                { typeof(IRangeValueProvider).FullName!, (owner, peer, id) => new RangeValueNodeInfoProvider(owner, peer, id) },
-                { typeof(IScrollProvider).FullName!, (owner, peer, id) => new ScrollNodeInfoProvider(owner, peer, id) },
-                { typeof(ISelectionItemProvider).FullName!, (owner, peer, id) => new SelectionItemNodeInfoProvider(owner, peer, id) },
-                { typeof(IToggleProvider).FullName!, (owner, peer, id) => new ToggleNodeInfoProvider(owner, peer, id) },
-                { typeof(IValueProvider).FullName!, (owner, peer, id) => new ValueNodeInfoProvider(owner, peer, id) },
-            };
-
         private readonly Dictionary<int, AutomationPeer> _peers;
         private readonly Dictionary<AutomationPeer, int> _peerIds;
 
@@ -96,17 +80,20 @@ private HashSet<INodeInfoProvider> GetOrCreateNodeInfoProvidersFromPeer(Automati
                     }
                 };
 
-                Type peerType = peer.GetType();
-                IEnumerable<Type> providerTypes = peerType.GetInterfaces()
-                    .Where(x => x.Namespace!.StartsWith(AUTOMATION_PROVIDER_NAMESPACE));
-                foreach (Type providerType in providerTypes)
-                {
-                    if (s_providerTypeInitializers.TryGetValue(providerType.FullName!, out NodeInfoProviderInitializer? ctor))
-                    {
-                        INodeInfoProvider nodeInfoProvider = ctor(this, peer, peerViewId);
-                        nodeInfoProviders.Add(nodeInfoProvider);
-                    }
-                }
+                if (peer is IExpandCollapseProvider)
+                    nodeInfoProviders.Add(new ExpandCollapseNodeInfoProvider(this, peer, peerViewId));
+                if (peer is IInvokeProvider)
+                    nodeInfoProviders.Add(new InvokeNodeInfoProvider(this, peer, peerViewId));
+                if (peer is IRangeValueProvider)
+                    nodeInfoProviders.Add(new RangeValueNodeInfoProvider(this, peer, peerViewId));
+                if (peer is IScrollProvider)
+                    nodeInfoProviders.Add(new ScrollNodeInfoProvider(this, peer, peerViewId));
+                if (peer is ISelectionItemProvider)
+                    nodeInfoProviders.Add(new SelectionItemNodeInfoProvider(this, peer, peerViewId));
+                if (peer is IToggleProvider)
+                    nodeInfoProviders.Add(new ToggleNodeInfoProvider(this, peer, peerViewId));
+                if (peer is IValueProvider)
+                    nodeInfoProviders.Add(new ValueNodeInfoProvider(this, peer, peerViewId));
             }
 
             virtualViewId = peerViewId;

From c0ae5be10f96248738bf41b5d40d7ce2acd4ed59 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Fri, 17 Oct 2025 20:05:00 +0200
Subject: [PATCH 03/16] Fix Android nullability errors

---
 .../Avalonia.Android/AvaloniaAccessHelper.cs  |  4 +-
 .../Platform/AndroidInsetsManager.cs          | 39 ++++++++++---------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs b/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
index d4026b6fa96..faacff7554e 100644
--- a/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
+++ b/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
@@ -138,9 +138,9 @@ protected override bool OnPerformActionForVirtualView(int virtualViewId, int act
                 .Aggregate(false, (a, b) => a | b);
         }
 
-        protected override void OnPopulateNodeForVirtualView(int virtualViewId, AccessibilityNodeInfoCompat nodeInfo)
+        protected override void OnPopulateNodeForVirtualView(int virtualViewId, AccessibilityNodeInfoCompat? nodeInfo)
         {
-            if (!_peers.TryGetValue(virtualViewId, out AutomationPeer? peer))
+            if (nodeInfo is null || !_peers.TryGetValue(virtualViewId, out AutomationPeer? peer))
             {
                 return; // BAIL!! No work to be done
             }
diff --git a/src/Android/Avalonia.Android/Platform/AndroidInsetsManager.cs b/src/Android/Avalonia.Android/Platform/AndroidInsetsManager.cs
index 8a3685b65e2..4a4159965c0 100644
--- a/src/Android/Avalonia.Android/Platform/AndroidInsetsManager.cs
+++ b/src/Android/Avalonia.Android/Platform/AndroidInsetsManager.cs
@@ -127,10 +127,13 @@ public Thickness SafeAreaPadding
                             WindowInsetsCompat.Type.StatusBars() | WindowInsetsCompat.Type.NavigationBars() |
                             WindowInsetsCompat.Type.DisplayCutout() : 0);
 
-                   return new Thickness(inset.Left / renderScaling,
-                        inset.Top / renderScaling,
-                        inset.Right / renderScaling,
-                        inset.Bottom / renderScaling);
+                    if (inset is not null)
+                    {
+                        return new Thickness(inset.Left / renderScaling,
+                            inset.Top / renderScaling,
+                            inset.Right / renderScaling,
+                            inset.Bottom / renderScaling);
+                    }
                 }
 
                 return default;
@@ -145,9 +148,10 @@ public Rect OccludedRect
 
                 if (insets != null)
                 {
-                    var navbarInset = insets.GetInsets(WindowInsetsCompat.Type.NavigationBars()).Bottom;
+                    var navbarInset = insets.GetInsets(WindowInsetsCompat.Type.NavigationBars())?.Bottom ?? 0;
+                    var imeInset = insets.GetInsets(WindowInsetsCompat.Type.Ime())?.Bottom ?? 0;
 
-                    var height = Math.Max((float)((insets.GetInsets(WindowInsetsCompat.Type.Ime()).Bottom - navbarInset) / _topLevel.RenderScaling), 0);
+                    var height = Math.Max((float)((imeInset - navbarInset) / _topLevel.RenderScaling), 0);
 
                     return new Rect(0, _topLevel.ClientSize.Height - SafeAreaPadding.Bottom - height, _topLevel.ClientSize.Width, height);
                 }
@@ -156,7 +160,7 @@ public Rect OccludedRect
             }
         }
 
-        public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
+        public WindowInsetsCompat? OnApplyWindowInsets(View? v, WindowInsetsCompat? insets)
         {
             insets = ViewCompat.OnApplyWindowInsets(v, insets);
             NotifySafeAreaChanged(SafeAreaPadding);
@@ -166,15 +170,14 @@ public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
                 _previousRect = OccludedRect;
             }
 
-            State = insets.IsVisible(WindowInsetsCompat.Type.Ime()) ? InputPaneState.Open : InputPaneState.Closed;
+            State = insets is not null && insets.IsVisible(WindowInsetsCompat.Type.Ime()) ? InputPaneState.Open : InputPaneState.Closed;
 
             // Workaround for weird inset values for android 11
             if(Build.VERSION.SdkInt == BuildVersionCodes.R)
             {
-                var imeInset = insets.GetInsets(WindowInsetsCompat.Type.Ime());
-                if(_previousImeInset == default)
-                    _previousImeInset = imeInset;
-                if(imeInset.Bottom != _previousImeInset.Bottom)
+                var imeInset = insets?.GetInsets(WindowInsetsCompat.Type.Ime());
+                _previousImeInset ??= imeInset;
+                if ((imeInset?.Bottom ?? 0) != (_previousImeInset?.Bottom ?? 0))
                 {
                     NotifyStateChanged(State, _previousRect, OccludedRect, TimeSpan.Zero, null);
                 }
@@ -319,18 +322,18 @@ internal void ApplyStatusBarState()
             SystemBarColor = _systemBarColor;
         }
 
-        public override WindowInsetsAnimationCompat.BoundsCompat OnStart(WindowInsetsAnimationCompat animation, WindowInsetsAnimationCompat.BoundsCompat bounds)
+        public override WindowInsetsAnimationCompat.BoundsCompat? OnStart(WindowInsetsAnimationCompat? animation, WindowInsetsAnimationCompat.BoundsCompat? bounds)
         {
-            if ((animation.TypeMask & WindowInsetsCompat.Type.Ime()) != 0)
+            if (animation is not null && bounds is not null && (animation.TypeMask & WindowInsetsCompat.Type.Ime()) != 0)
             {
                 var insets = ViewCompat.GetRootWindowInsets(Window.DecorView);
 
                 if (insets != null)
                 {
-                    var navbarInset = insets.GetInsets(WindowInsetsCompat.Type.NavigationBars()).Bottom;
-                    var height = Math.Max(0, (float)((bounds.LowerBound.Bottom - navbarInset) / _topLevel.RenderScaling));
+                    var navbarInset = insets.GetInsets(WindowInsetsCompat.Type.NavigationBars())?.Bottom ?? 0;
+                    var height = Math.Max(0, (float)(((bounds.LowerBound?.Bottom ?? 0) - navbarInset) / _topLevel.RenderScaling));
                     var upperRect = new Rect(0, _topLevel.ClientSize.Height - SafeAreaPadding.Bottom - height, _topLevel.ClientSize.Width, height);
-                    height = Math.Max(0, (float)((bounds.UpperBound.Bottom - navbarInset) / _topLevel.RenderScaling));
+                    height = Math.Max(0, (float)(((bounds.UpperBound?.Bottom ?? 0) - navbarInset) / _topLevel.RenderScaling));
                     var lowerRect = new Rect(0, _topLevel.ClientSize.Height - SafeAreaPadding.Bottom - height, _topLevel.ClientSize.Width, height);
 
                     var duration = TimeSpan.FromMilliseconds(animation.DurationMillis);
@@ -344,7 +347,7 @@ public override WindowInsetsAnimationCompat.BoundsCompat OnStart(WindowInsetsAni
             return base.OnStart(animation, bounds);
         }
 
-        public override WindowInsetsCompat OnProgress(WindowInsetsCompat insets, IList<WindowInsetsAnimationCompat> runningAnimations)
+        public override WindowInsetsCompat? OnProgress(WindowInsetsCompat? insets, IList<WindowInsetsAnimationCompat>? runningAnimations)
         {
             return insets;
         }

From 9e60a76aeb3b85ed801e0f73c2ece825b2f2a132 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Sat, 18 Oct 2025 12:14:46 +0200
Subject: [PATCH 04/16] Fix WindowMetrics.WindowInsets removed from AndroidX

---
 .../Avalonia.Android/Platform/AndroidScreens.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Android/Avalonia.Android/Platform/AndroidScreens.cs b/src/Android/Avalonia.Android/Platform/AndroidScreens.cs
index 95d2530edc4..3f1f9bf44e4 100644
--- a/src/Android/Avalonia.Android/Platform/AndroidScreens.cs
+++ b/src/Android/Avalonia.Android/Platform/AndroidScreens.cs
@@ -32,11 +32,18 @@ public void Refresh(Context context)
             var metrics = metricsCalc.ComputeMaximumWindowMetrics(displayContext);
             Bounds = new(metrics.Bounds.Left, metrics.Bounds.Top, metrics.Bounds.Width(), metrics.Bounds.Height());
 
-            var inset = metrics.WindowInsets.GetInsets(WindowInsetsCompat.Type.SystemBars());
-            WorkingArea = new(Bounds.X + inset.Left,
-                Bounds.Y + inset.Top,
-                Bounds.Width - (inset.Left + inset.Right),
-                Bounds.Height - (inset.Top + inset.Bottom));
+            var windowInsets = new WindowInsetsCompat.Builder().Build();
+            if (windowInsets?.GetInsets(WindowInsetsCompat.Type.SystemBars()) is { } inset)
+            {
+                WorkingArea = new(Bounds.X + inset.Left,
+                    Bounds.Y + inset.Top,
+                    Bounds.Width - (inset.Left + inset.Right),
+                    Bounds.Height - (inset.Top + inset.Bottom));
+            }
+            else
+            {
+                WorkingArea = Bounds;
+            }
 
             if (context.Resources?.Configuration is { } config)
             {

From 747a40c3e9f4d1c67d9001fa23abb5a0ef96ab16 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Sat, 18 Oct 2025 14:00:19 +0200
Subject: [PATCH 05/16] Update pipelines

---
 azure-pipelines-integrationtests.yml | 16 ++++++++--------
 azure-pipelines.yml                  | 28 ++++++++++++++--------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml
index b34def779f8..831ad74e947 100644
--- a/azure-pipelines-integrationtests.yml
+++ b/azure-pipelines-integrationtests.yml
@@ -5,13 +5,13 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 6.0 Runtime'
+    displayName: 'Use .NET 8.0 Runtime'
     inputs:
       packageType: runtime
-      version: 6.0.x
+      version: 8.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET 8.0 SDK'
+    displayName: 'Use .NET 10.0 SDK'
     inputs:
       packageType: sdk
       useGlobalJson: true
@@ -35,7 +35,7 @@ jobs:
       rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")")
       pkill IntegrationTestApp
       ./samples/IntegrationTestApp/bundle.sh
-      open -n ./samples/IntegrationTestApp/bin/Debug/net8.0/osx-$arch/publish/IntegrationTestApp.app
+      open -n ./samples/IntegrationTestApp/bin/Debug/net10.0/osx-$arch/publish/IntegrationTestApp.app
       pkill IntegrationTestApp
     displayName: 'Build IntegrationTestApp'
 
@@ -57,17 +57,17 @@ jobs:
 
 - job: Windows
   pool:
-    vmImage: 'windows-2022'
+    vmImage: 'windows-2025'
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 6.0 Runtime'
+    displayName: 'Use .NET 8.0 Runtime'
     inputs:
       packageType: runtime
-      version: 6.0.x
+      version: 8.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET 8.0 SDK'
+    displayName: 'Use .NET 10.0 SDK'
     inputs:
       packageType: sdk
       useGlobalJson: true
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 956bcde6d7b..a1516581c59 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,12 +2,12 @@ jobs:
 
 - job: GetPRNumber
   pool:
-    vmImage: 'ubuntu-22.04'
+    vmImage: 'ubuntu-24.04'
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 8.0 SDK'
+    displayName: 'Use .NET 10.0 SDK'
     inputs:
       packageType: sdk
       useGlobalJson: true
@@ -23,16 +23,16 @@ jobs:
       
 - job: Linux
   pool:
-    vmImage: 'ubuntu-22.04'
+    vmImage: 'ubuntu-24.04'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 6.0 Runtime'
+    displayName: 'Use .NET 8.0 Runtime'
     inputs:
       packageType: runtime
-      version: 6.0.x
+      version: 8.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET 8.0 SDK'
+    displayName: 'Use .NET 10.0 SDK'
     inputs:
       packageType: sdk
       useGlobalJson: true
@@ -65,13 +65,13 @@ jobs:
     vmImage: 'macos-13'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 6.0 Runtime'
+    displayName: 'Use .NET 8.0 Runtime'
     inputs:
       packageType: runtime
-      version: 6.0.x
+      version: 8.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET 8.0 SDK'
+    displayName: 'Use .NET 10.0 SDK'
     inputs:
       packageType: sdk
       useGlobalJson: true
@@ -134,18 +134,18 @@ jobs:
 
 - job: Windows
   pool:
-    vmImage: 'windows-2022'
+    vmImage: 'windows-2025'
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 6.0 Runtime'
+    displayName: 'Use .NET 8.0 Runtime'
     inputs:
       packageType: runtime
-      version: 6.0.x
+      version: 8.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET 8.0 SDK'
+    displayName: 'Use .NET 10.0 SDK'
     inputs:
       packageType: sdk
       useGlobalJson: true
@@ -160,7 +160,7 @@ jobs:
     displayName: 'Install Nuke'
     inputs:
       script: |
-       dotnet tool install --global Nuke.GlobalTool --version 6.2.1 
+       dotnet tool install --global Nuke.GlobalTool --version 9.0.4 
 
   - task: CmdLine@2
     displayName: 'Run Nuke'

From a3f9085b2ad712bf0345eb96a76658a0af4d60a6 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Mon, 3 Nov 2025 10:34:33 +0100
Subject: [PATCH 06/16] Fix ValidateApiDiff for missing frameworks

---
 nukebuild/ApiDiffHelper.cs | 20 +++-----------------
 nukebuild/_build.csproj    |  4 ++--
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/nukebuild/ApiDiffHelper.cs b/nukebuild/ApiDiffHelper.cs
index 1d1f1b1b320..4a516305576 100644
--- a/nukebuild/ApiDiffHelper.cs
+++ b/nukebuild/ApiDiffHelper.cs
@@ -326,25 +326,11 @@ public static async Task<GlobalDiffInfo> DownloadAndExtractPackagesAsync(
 
             var frameworkDiffs = new List<FrameworkDiffInfo>();
 
-            // Handle frameworks that exist only in the current package.
-            foreach (var framework in currentFolderNames.Keys.Except(baselineFolderNames.Keys))
-            {
-                var folderName = currentFolderNames[framework];
-                Directory.CreateDirectory(baselineFolderPath / folderName);
-                baselineFolderNames.Add(framework, folderName);
-            }
-
-            // Handle frameworks that exist only for the baseline package.
-            foreach (var framework in baselineFolderNames.Keys.Except(currentFolderNames.Keys))
-            {
-                var folderName = baselineFolderNames[framework];
-                Directory.CreateDirectory(currentFolderPath / folderName);
-                currentFolderNames.Add(framework, folderName);
-            }
-
             foreach (var (framework, currentFolderName) in currentFolderNames)
             {
-                var baselineFolderName = baselineFolderNames[framework];
+                // Ignore new frameworks that didn't exist in the baseline package. Empty folders make the ApiDiff tool crash.
+                if (!baselineFolderNames.TryGetValue(framework, out var baselineFolderName))
+                    continue;
 
                 frameworkDiffs.Add(new FrameworkDiffInfo(
                     framework,
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index 2ea83ead719..2dba75782b4 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -21,8 +21,8 @@
     <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" />
-    <PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[10.0.100-preview.7.25380.108]" />
-    <PackageDownload Include="Microsoft.DotNet.ApiDiff.Tool" Version="[10.0.100-rc.1.25414.111]" />
+    <PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[10.0.100-rc.2.25502.107]" />
+    <PackageDownload Include="Microsoft.DotNet.ApiDiff.Tool" Version="[10.0.100-rc.2.25502.107]" />
     <PackageDownload Include="dotnet-ilrepack" Version="[1.0.0]" />
   </ItemGroup>
 

From b52823835ce223f79ee05de5851adcd9162b25da Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Mon, 3 Nov 2025 17:17:46 +0100
Subject: [PATCH 07/16] Fix Windows integration tests

---
 .../DesignerSupportTests.cs                               | 8 ++++----
 .../Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
index a2131121cb6..09bd74bf41c 100644
--- a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
+++ b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
@@ -29,25 +29,25 @@ public DesignerSupportTests(Xunit.Abstractions.ITestOutputHelper outputHelper)
 
         [SkippableTheory,
          InlineData(
-            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net8.0/",
+            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net10.0/",
             "Avalonia.DesignerSupport.TestApp",
             "Avalonia.DesignerSupport.TestApp.dll",
             @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml",
             "win32"),
          InlineData(
-            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net8.0\",
+            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net10.0\",
             "ControlCatalog.NetCore",
             "ControlCatalog.dll",
             @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml",
             "win32"),
         InlineData(
-            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net8.0/",
+            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net10.0/",
             "Avalonia.DesignerSupport.TestApp",
             "Avalonia.DesignerSupport.TestApp.dll",
             @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml",
             "avalonia-remote"),
         InlineData(
-            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net8.0\",
+            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net10.0\",
             "ControlCatalog.NetCore",
             "ControlCatalog.dll",
             @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml",
diff --git a/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs b/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs
index fa7cb6460ea..f5c22eb5be3 100644
--- a/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs
@@ -9,7 +9,7 @@ namespace Avalonia.IntegrationTests.Appium
 {
     public class DefaultAppFixture : IDisposable
     {
-        private const string TestAppPath = @"..\..\..\..\..\samples\IntegrationTestApp\bin\Debug\net8.0\IntegrationTestApp.exe";
+        private const string TestAppPath = @"..\..\..\..\..\samples\IntegrationTestApp\bin\Debug\net10.0\IntegrationTestApp.exe";
         private const string TestAppBundleId = "net.avaloniaui.avalonia.integrationtestapp";
 
         public DefaultAppFixture()

From 1f3e1538ea86ab2f15102b19455a853c53ae4e7f Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 4 Nov 2025 11:23:19 +0100
Subject: [PATCH 08/16] Update Xamarin.AndroidX.Window to 1.5.0

---
 build/TargetFrameworks.props                               | 2 +-
 packages/Avalonia/AvaloniaSingleProject.targets            | 2 +-
 .../Avalonia.Android/Automation/ToggleNodeInfoProvider.cs  | 7 ++++++-
 src/Android/Avalonia.Android/Avalonia.Android.csproj       | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/TargetFrameworks.props b/build/TargetFrameworks.props
index 4be557a59b3..2349206414f 100644
--- a/build/TargetFrameworks.props
+++ b/build/TargetFrameworks.props
@@ -20,7 +20,7 @@
     <AvsMinSupportedIOSVersion>13.0</AvsMinSupportedIOSVersion>
     <AvsMinSupportedTvOSVersion>13.0</AvsMinSupportedTvOSVersion>
     <AvsMinSupportedMacCatalystVersion>13.1</AvsMinSupportedMacCatalystVersion>
-    <AvsMinSupportedAndroidVersion>21.0</AvsMinSupportedAndroidVersion>
+    <AvsMinSupportedAndroidVersion>23.0</AvsMinSupportedAndroidVersion>
     <!-- Desktop OS min version is not set in any of ours backends, but only used in some samples. -->
     <!-- Avalonia technically supports 10.12. -->
     <AvsMinSupportedMacOsVersion>10.15</AvsMinSupportedMacOsVersion>
diff --git a/packages/Avalonia/AvaloniaSingleProject.targets b/packages/Avalonia/AvaloniaSingleProject.targets
index a776f12a7df..39f02f2dfef 100644
--- a/packages/Avalonia/AvaloniaSingleProject.targets
+++ b/packages/Avalonia/AvaloniaSingleProject.targets
@@ -98,7 +98,7 @@
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'">13.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">10.15</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
   </PropertyGroup>
 
diff --git a/src/Android/Avalonia.Android/Automation/ToggleNodeInfoProvider.cs b/src/Android/Avalonia.Android/Automation/ToggleNodeInfoProvider.cs
index 569714c88a6..24ce3fa120e 100644
--- a/src/Android/Avalonia.Android/Automation/ToggleNodeInfoProvider.cs
+++ b/src/Android/Avalonia.Android/Automation/ToggleNodeInfoProvider.cs
@@ -32,7 +32,12 @@ public override void PopulateNodeInfo(AccessibilityNodeInfoCompat nodeInfo)
             nodeInfo.Clickable = true;
 
             IToggleProvider provider = GetProvider();
-            nodeInfo.Checked = provider.ToggleState == ToggleState.On;
+            nodeInfo.Checked = provider.ToggleState switch
+            {
+                ToggleState.On => 1,
+                ToggleState.Indeterminate => 2,
+                _ => 0
+            };
             nodeInfo.Checkable = true;
         }
     }
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index 4dc8d3113e3..97acf3d012c 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.Window" Version="1.4.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Window" Version="1.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />

From 92ed9f963ff42c97542787014170bf755b1b1f57 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 4 Nov 2025 16:34:52 +0100
Subject: [PATCH 09/16] Fix MacCatalyst supported version

---
 .../ControlCatalog.MacCatalyst.csproj                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj b/samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
index 0a1329e2e3a..954ed20d99b 100644
--- a/samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
+++ b/samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
@@ -5,7 +5,7 @@
     <ProvisioningType>manual</ProvisioningType>
     <TargetFramework>$(AvsCurrentMacCatalystTargetFramework)</TargetFramework>
     <!-- Used to support Desktop Mode Idiom, min supported version is 13.1, which supports iPad scaling. -->
-    <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
     <UseInterpreter>true</UseInterpreter>
   </PropertyGroup>
   

From e5d04ec50bdf20b86b474fbc899ec693ea63eab4 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 4 Nov 2025 16:36:06 +0100
Subject: [PATCH 10/16] Remove unused Xunit.Extensions.Ordering

---
 .../Avalonia.IntegrationTests.Appium.csproj                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj
index e2b13d800ae..53cea417b58 100644
--- a/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj
+++ b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj
@@ -16,7 +16,6 @@
   <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'" />
-    <PackageReference Include="Xunit.Extensions.Ordering" Version="1.4.5" />
   </ItemGroup>
 
   <Import Project="..\..\build\XUnit.props" />

From 216455ab3153c3c235141b0276158791a0b7eec7 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 4 Nov 2025 19:25:26 +0100
Subject: [PATCH 11/16] Try to fix macOS integration tests

---
 azure-pipelines-integrationtests.yml | 1 -
 samples/IntegrationTestApp/bundle.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml
index 831ad74e947..89b6a3ac533 100644
--- a/azure-pipelines-integrationtests.yml
+++ b/azure-pipelines-integrationtests.yml
@@ -31,7 +31,6 @@ jobs:
       pkill IntegrationTestApp
       sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer        
       ./build.sh CompileNative
-      sudo xcode-select -s /Applications/Xcode_14.3.app/Contents/Developer
       rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")")
       pkill IntegrationTestApp
       ./samples/IntegrationTestApp/bundle.sh
diff --git a/samples/IntegrationTestApp/bundle.sh b/samples/IntegrationTestApp/bundle.sh
index 2b480723c2a..6f49bdbee36 100755
--- a/samples/IntegrationTestApp/bundle.sh
+++ b/samples/IntegrationTestApp/bundle.sh
@@ -9,4 +9,4 @@ arch="arm64"
 fi
 
 dotnet restore -r osx-$arch
-dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-$arch
+dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-$arch -p:SelfContained=true

From aec68d5b5b9419a6205a60c95e36e90446fe1195 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 4 Nov 2025 20:48:25 +0100
Subject: [PATCH 12/16] Update pipeline runner to macOS 15

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a1516581c59..06da4bcd2b6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -62,7 +62,7 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macos-13'
+    vmImage: 'macos-15'
   steps:
   - task: UseDotNet@2
     displayName: 'Use .NET 8.0 Runtime'
@@ -95,11 +95,11 @@ jobs:
     inputs:
       actions: 'build'
       scheme: ''
-      sdk: 'macosx14.2'
+      sdk: 'macosx26.0'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
       xcodeVersion: 'specifyPath' # Options: 8, 9, default, specifyPath
-      xcodeDeveloperDir: '/Applications/Xcode_15.2.app/Contents/Developer'
+      xcodeDeveloperDir: '/Applications/Xcode_26.0.app/Contents/Developer'
       args: '-derivedDataPath ./'
 
   - task: CmdLine@2

From e8f48f20ed52b015e87bfb46bb1cbcaf6efe22c0 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 5 Nov 2025 01:00:02 +0100
Subject: [PATCH 13/16] Disable LeakTests

---
 nukebuild/Build.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index c7e8b776f76..4117ac29089 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -414,13 +414,13 @@ void DoMemoryTest()
 
             ApiDiffHelper.MergePackageMarkdownDiffFiles(outputFolderPath, baselineDisplay, currentDisplay);
         });
-    
+
     Target RunTests => _ => _
         .DependsOn(RunCoreLibsTests)
         .DependsOn(RunRenderTests)
         .DependsOn(RunToolsTests)
-        .DependsOn(RunHtmlPreviewerTests)
-        .DependsOn(RunLeakTests);
+        .DependsOn(RunHtmlPreviewerTests);
+        //.DependsOn(RunLeakTests); // dotMemory Unit doesn't support modern .NET versions, see https://youtrack.jetbrains.com/issue/DMU-300/
 
     Target Package => _ => _
         .DependsOn(RunTests)

From a12ac3e2541a0c06497800474ece0d472efd38e3 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 5 Nov 2025 09:44:40 +0100
Subject: [PATCH 14/16] Fix .NET Framework unit tests

---
 build/Base.props                                     | 12 ++++--------
 build/Moq.props                                      |  2 +-
 .../Avalonia.Markup.Xaml.UnitTests.csproj            |  2 +-
 tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj   |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/build/Base.props b/build/Base.props
index 1c618dfcd67..ab5853fcfa9 100644
--- a/build/Base.props
+++ b/build/Base.props
@@ -1,12 +1,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- '!NET6_0_OR_GREATER' equivalent -->
-  <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')))">
-    <PackageReference Include="System.Memory" Version="4.6.3" />
-  </ItemGroup>
-  <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')))">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-rc.2.25502.107" />
-  </ItemGroup>
+  <!-- '!NET8_0_OR_GREATER' equivalent -->
   <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0')))">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.10" />
   </ItemGroup>
 </Project>
diff --git a/build/Moq.props b/build/Moq.props
index 357f0c9a5f6..fc659f7f5fc 100644
--- a/build/Moq.props
+++ b/build/Moq.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Moq" Version="4.20.72" />
   </ItemGroup>
 </Project>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index 50e30546c77..86da81bb007 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>$(AvsCurrentTargetFramework);net47</TargetFrameworks>
+    <TargetFrameworks>$(AvsCurrentTargetFramework);net481</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index 2d740f28074..eaf09b3e63c 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(AvsCurrentTargetFramework);net47</TargetFrameworks>
+    <TargetFrameworks>$(AvsCurrentTargetFramework);net481</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputType>Library</OutputType>
     <IsPackable>false</IsPackable>

From e4977208a48d89535c81c9b5f4484ebecde96e6a Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 5 Nov 2025 11:07:42 +0100
Subject: [PATCH 15/16] Fix BuildTests

---
 tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj | 4 ++--
 tests/BuildTests/BuildTests.Browser/BuildTests.Browser.csproj | 2 +-
 tests/BuildTests/BuildTests.Desktop/BuildTests.Desktop.csproj | 2 +-
 tests/BuildTests/BuildTests.FSharp/BuildTests.FSharp.fsproj   | 2 +-
 .../BuildTests.NativeAot/BuildTests.NativeAot.csproj          | 2 +-
 .../BuildTests.WpfHybrid/BuildTests.WpfHybrid.csproj          | 2 +-
 tests/BuildTests/BuildTests.iOS/BuildTests.iOS.csproj         | 2 +-
 tests/BuildTests/BuildTests/BuildTests.csproj                 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj b/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj
index eaac81be0bb..f1e0075e683 100644
--- a/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj
+++ b/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+    <TargetFramework>net10.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ApplicationId>com.Avalonia.BuildTests</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
diff --git a/tests/BuildTests/BuildTests.Browser/BuildTests.Browser.csproj b/tests/BuildTests/BuildTests.Browser/BuildTests.Browser.csproj
index ee339b1bf0e..d637e8cefa8 100644
--- a/tests/BuildTests/BuildTests.Browser/BuildTests.Browser.csproj
+++ b/tests/BuildTests/BuildTests.Browser/BuildTests.Browser.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-browser</TargetFramework>
+    <TargetFramework>net10.0-browser</TargetFramework>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
diff --git a/tests/BuildTests/BuildTests.Desktop/BuildTests.Desktop.csproj b/tests/BuildTests/BuildTests.Desktop/BuildTests.Desktop.csproj
index 837660a5315..afbcea98d09 100644
--- a/tests/BuildTests/BuildTests.Desktop/BuildTests.Desktop.csproj
+++ b/tests/BuildTests/BuildTests.Desktop/BuildTests.Desktop.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
diff --git a/tests/BuildTests/BuildTests.FSharp/BuildTests.FSharp.fsproj b/tests/BuildTests/BuildTests.FSharp/BuildTests.FSharp.fsproj
index 52d39517971..2832d18e9d4 100644
--- a/tests/BuildTests/BuildTests.FSharp/BuildTests.FSharp.fsproj
+++ b/tests/BuildTests/BuildTests.FSharp/BuildTests.FSharp.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
diff --git a/tests/BuildTests/BuildTests.NativeAot/BuildTests.NativeAot.csproj b/tests/BuildTests/BuildTests.NativeAot/BuildTests.NativeAot.csproj
index efe4d85854e..f0dd5430c28 100644
--- a/tests/BuildTests/BuildTests.NativeAot/BuildTests.NativeAot.csproj
+++ b/tests/BuildTests/BuildTests.NativeAot/BuildTests.NativeAot.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
   </PropertyGroup>
diff --git a/tests/BuildTests/BuildTests.WpfHybrid/BuildTests.WpfHybrid.csproj b/tests/BuildTests/BuildTests.WpfHybrid/BuildTests.WpfHybrid.csproj
index 05654c41da1..13af34dc4d0 100644
--- a/tests/BuildTests/BuildTests.WpfHybrid/BuildTests.WpfHybrid.csproj
+++ b/tests/BuildTests/BuildTests.WpfHybrid/BuildTests.WpfHybrid.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
diff --git a/tests/BuildTests/BuildTests.iOS/BuildTests.iOS.csproj b/tests/BuildTests/BuildTests.iOS/BuildTests.iOS.csproj
index 6c8236d5353..bcac3d68b52 100644
--- a/tests/BuildTests/BuildTests.iOS/BuildTests.iOS.csproj
+++ b/tests/BuildTests/BuildTests.iOS/BuildTests.iOS.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-ios</TargetFramework>
+    <TargetFramework>net10.0-ios</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/tests/BuildTests/BuildTests/BuildTests.csproj b/tests/BuildTests/BuildTests/BuildTests.csproj
index 4903b3f3d1e..6d4a500789c 100644
--- a/tests/BuildTests/BuildTests/BuildTests.csproj
+++ b/tests/BuildTests/BuildTests/BuildTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <EnableDefaultItems>false</EnableDefaultItems>

From 649bc44df04d98ad3acf485e008bdd4c6191521c Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 5 Nov 2025 14:00:47 +0100
Subject: [PATCH 16/16] Bump minimum Android API level to 24

---
 build/TargetFrameworks.props                                  | 2 +-
 packages/Avalonia/AvaloniaSingleProject.targets               | 2 +-
 tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/TargetFrameworks.props b/build/TargetFrameworks.props
index 2349206414f..96541e7ecf5 100644
--- a/build/TargetFrameworks.props
+++ b/build/TargetFrameworks.props
@@ -20,7 +20,7 @@
     <AvsMinSupportedIOSVersion>13.0</AvsMinSupportedIOSVersion>
     <AvsMinSupportedTvOSVersion>13.0</AvsMinSupportedTvOSVersion>
     <AvsMinSupportedMacCatalystVersion>13.1</AvsMinSupportedMacCatalystVersion>
-    <AvsMinSupportedAndroidVersion>23.0</AvsMinSupportedAndroidVersion>
+    <AvsMinSupportedAndroidVersion>24.0</AvsMinSupportedAndroidVersion>
     <!-- Desktop OS min version is not set in any of ours backends, but only used in some samples. -->
     <!-- Avalonia technically supports 10.12. -->
     <AvsMinSupportedMacOsVersion>10.15</AvsMinSupportedMacOsVersion>
diff --git a/packages/Avalonia/AvaloniaSingleProject.targets b/packages/Avalonia/AvaloniaSingleProject.targets
index 39f02f2dfef..25125b26e44 100644
--- a/packages/Avalonia/AvaloniaSingleProject.targets
+++ b/packages/Avalonia/AvaloniaSingleProject.targets
@@ -98,7 +98,7 @@
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'">13.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">10.15</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
   </PropertyGroup>
 
diff --git a/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj b/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj
index f1e0075e683..29c3ed6460b 100644
--- a/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj
+++ b/tests/BuildTests/BuildTests.Android/BuildTests.Android.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ApplicationId>com.Avalonia.BuildTests</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>