Update to .NET 10

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>

api/Avalonia.nupkg.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
@@ -181,4 +181,4 @@
     <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Left>
     <Right>current/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Right>
   </Suppression>
-</Suppressions>
+</Suppressions>

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
@@ -31,11 +31,10 @@ 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
-      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 +56,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

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
@@ -62,16 +62,16 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macos-13'
+    vmImage: 'macos-15'
   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
@@ -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
@@ -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'

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.5.5" />
-  </ItemGroup>
-  <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')))">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-  </ItemGroup>
+  <!-- '!NET8_0_OR_GREATER' equivalent -->
   <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0')))">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
+    <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>

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>

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>
@@ -20,7 +20,7 @@
     <AvsMinSupportedIOSVersion>13.0</AvsMinSupportedIOSVersion>
     <AvsMinSupportedTvOSVersion>13.0</AvsMinSupportedTvOSVersion>
     <AvsMinSupportedMacCatalystVersion>13.1</AvsMinSupportedMacCatalystVersion>
-    <AvsMinSupportedAndroidVersion>21.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>

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>
+</Project>

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>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.411",
+    "version": "10.0.100-rc.2.25502.107",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {

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,

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")
@@ -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)

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>
 

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>

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'">24.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
   </PropertyGroup>
 

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>

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>

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>
 

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>
 

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