Add .NET 8 target (Avalonia 11.1) (#14535)

* Add .NET 8 target to packable projects * Update test projects * Update sample projects to target .NET 8 * Update main Avalonia package to target .NET 8 as well * Remove MSBuildEnableWorkloadResolver hack and some minor change * Use net8.0 in nuke build as well * Pin 8.0.0 SDK * Adjust API validation * Pin a valid version * Remove net461 target from Avalonia package * Remove unused net6.0 target from Avalonia.Designer.HostApp * Adjust API diff * Update ControlCatalog.Android.csproj * Remove MSBuildEnableWorkloadResolver * Fix Browser issues on .NET 8 * Fix .NET 8 error * Fix merge conflicts * Replace explicit TFMs in .csproj files with a centralized registry * Fix merge conflict * Fix AvsLegacyWindowsTargetFrameworks and add hacks for the tests * Update XCode project CommandLineArgument --------- Co-authored-by: Nikita Tsukanov <[email protected]>
AvaloniaUI · Mar 5, 2024 · 326ef7c · 326ef7c
1 parent 3657128
commit 326ef7c
Show file tree

Hide file tree

Showing 108 changed files with 282 additions and 192 deletions.
diff --git a/Avalonia.sln b/Avalonia.sln
@@ -120,6 +120,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
  build\TrimmingEnable.props = build\TrimmingEnable.props
  build\UnitTests.NetFX.props = build\UnitTests.NetFX.props
  build\XUnit.props = build\XUnit.props
+ build\TargetFrameworks.props = build\TargetFrameworks.props
  EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6FAF79-58B4-482F-9122-0668C346364C}"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,11 +1,11 @@
 <Project>
  <Import Project="$(MSBuildThisFileDirectory)/build/AvaloniaPublicKey.props"/>
+ <Import Project="$(MSBuildThisFileDirectory)/build/TargetFrameworks.props"/>
  <PropertyGroup>
  <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)build-intermediate/nuget</PackageOutputPath>
  <AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\netstandard2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
  <!-- https://github.com/dotnet/msbuild/issues/2661 -->
  <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
- <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
  <RunApiCompat>False</RunApiCompat>
  <LangVersion>11</LangVersion>
  </PropertyGroup>

diff --git a/api/Avalonia.Android.nupkg.xml b/api/Avalonia.Android.nupkg.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="https://www.w3.org/2001/XMLSchema">
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Animation</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Animator</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Attribute</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Boolean</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Color</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Dimension</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Drawable</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Id</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Integer</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Interpolator</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Layout</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.String</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Style</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0001</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource.Styleable</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+ <Suppression>
+ <DiagnosticId>CP0007</DiagnosticId>
+ <Target>T:Avalonia.Android.Internal.Resource</Target>
+ <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
+ <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+ </Suppression>
+</Suppressions>
diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml
@@ -11,7 +11,7 @@ jobs:
  version: 6.0.x
 
  - task: UseDotNet@2
- displayName: 'Use .NET 7.0 SDK'
+ displayName: 'Use .NET 8.0 SDK'
  inputs:
  packageType: sdk
  useGlobalJson: true
@@ -33,7 +33,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/net7.0/osx-$arch/publish/IntegrationTestApp.app
+ open -n ./samples/IntegrationTestApp/bin/Debug/net8.0/osx-$arch/publish/IntegrationTestApp.app
  pkill IntegrationTestApp
  displayName: 'Build IntegrationTestApp'
 
@@ -65,7 +65,7 @@ jobs:
  version: 6.0.x
 
  - task: UseDotNet@2
- displayName: 'Use .NET 7.0 SDK'
+ displayName: 'Use .NET 8.0 SDK'
  inputs:
  packageType: sdk
  useGlobalJson: true

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -36,7 +36,7 @@ jobs:
  version: 6.0.x
 
  - task: UseDotNet@2
- displayName: 'Use .NET 7.0 SDK'
+ displayName: 'Use .NET 8.0 SDK'
  inputs:
  packageType: sdk
  useGlobalJson: true
@@ -82,7 +82,7 @@ jobs:
  version: 6.0.x
 
  - task: UseDotNet@2
- displayName: 'Use .NET 7.0 SDK'
+ displayName: 'Use .NET 8.0 SDK'
  inputs:
  packageType: sdk
  useGlobalJson: true
@@ -162,7 +162,7 @@ jobs:
  version: 6.0.x
 
  - task: UseDotNet@2
- displayName: 'Use .NET 7.0 SDK'
+ displayName: 'Use .NET 8.0 SDK'
  inputs:
  packageType: sdk
  useGlobalJson: true

diff --git a/build/TargetFrameworks.props b/build/TargetFrameworks.props
@@ -0,0 +1,15 @@
+<Project>
+ <PropertyGroup>
+ <AvsCurrentTargetFramework>net8.0</AvsCurrentTargetFramework>
+ <AvsCurrentWindowsTargetFramework>$(AvsCurrentTargetFramework)-windows</AvsCurrentWindowsTargetFramework>
+ <AvsCurrentAndroidTargetFramework>$(AvsCurrentTargetFramework)-android34</AvsCurrentAndroidTargetFramework>
+ <AvsCurrentIOSTargetFramework>$(AvsCurrentTargetFramework)-ios17.0</AvsCurrentIOSTargetFramework>
+ <AvsCurrentTvOSTargetFramework>$(AvsCurrentTargetFramework)-tvos17</AvsCurrentTvOSTargetFramework>
+ <AvsCurrentBrowserTargetFramework>$(AvsCurrentTargetFramework)-browser</AvsCurrentBrowserTargetFramework>
+ <AvsCurrentTizenTargetFramework>$(AvsCurrentTargetFramework)-tizen</AvsCurrentTizenTargetFramework>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(AvsSkipBuildingLegacyTargetFrameworks)' != 'True'">
+ <AvsLegacyTargetFrameworks>net6.0</AvsLegacyTargetFrameworks>
+ <AvsLegacyWindowsTargetFrameworks>net6.0-windows</AvsLegacyWindowsTargetFrameworks>
+ </PropertyGroup>
+</Project>
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
-  "sdk": {
-  "version": "7.0.404",
-  "rollForward": "latestFeature"
-  },
-  "msbuild-sdks": {
-  "Microsoft.Build.Traversal": "3.2.0"
-  }
+ "sdk": {
+ "version": "8.0.101",
+ "rollForward": "latestFeature"
+ },
+ "msbuild-sdks": {
+ "Microsoft.Build.Traversal": "3.2.0"
+ }
 }
diff --git a/...src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme b/...src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
@@ -56,7 +56,7 @@
  </MacroExpansion>
  <CommandLineArguments>
  <CommandLineArgument
- argument = "bin/Debug/net6.0/ControlCatalog.NetCore.dll"
+ argument = "bin/Debug/net8.0/ControlCatalog.NetCore.dll"
  isEnabled = "YES">
  </CommandLineArgument>
  </CommandLineArguments>

diff --git a/nukebuild/ApiDiffHelper.cs b/nukebuild/ApiDiffHelper.cs
@@ -110,8 +110,8 @@ await Task.WhenAll(pairs.Select(p => Task.Run(() =>
  private static readonly (string oldTfm, string newTfm)[] s_tfmRedirects = new[]
  {
  // We use StartsWith below comparing these tfm, as we ignore platform versions (like, net6.0-ios16.1)
- ("net6.0-android", "net7.0-android"),
- ("net6.0-ios", "net7.0-ios"),
+ ("net6.0-android", "net8.0-android"),
+ ("net6.0-ios", "net8.0-ios"),
  // Designer was moved from netcoreapp to netstandard 
  ("netcoreapp2.0", "netstandard2.0")
  };
@@ -171,8 +171,15 @@ public static async Task ValidatePackage(
 
  if (targetDll?.entry is null)
  {
+ if (packageId == "Avalonia"
+ && baselineDll.target is "net461" or "netcoreapp2.0")
+ {
+ // In 11.1 we have removed net461 and netcoreapp2.0 targets from Avalonia package.
+ continue;
+ }
+
  var actualTargets = string.Join(", ",
- targetDlls.Select(d => $"{d.target} ({baselineDll.entry.Name})"));
+ targetDlls.Select(d => $"{d.target} ({d.entry.Name})"));
  throw new InvalidOperationException(
  $"Some assemblies are missing in the new package {packageId}: {baselineDll.entry.Name} for {baselineDll.target}."
  + $"\r\nActual targets: {actualTargets}.");

diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
@@ -176,19 +176,29 @@ void RunCoreTest(string projectName)
 
  foreach (var fw in targetFrameworks)
  {
- if (fw.StartsWith("net4")
+ var tfm = fw;
+ if (tfm == "$(AvsCurrentTargetFramework)")
+ {
+ tfm = "net8.0";
+ }
+ if (tfm == "$(AvsLegacyTargetFrameworks)")
+ {
+ tfm = "net6.0";
+ }
+
+ if (tfm.StartsWith("net4")
  && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
  && Environment.GetEnvironmentVariable("FORCE_LINUX_TESTS") != "1")
  {
- Information($"Skipping {projectName} ({fw}) tests on *nix - https://github.com/mono/mono/issues/13969");
+ Information($"Skipping {projectName} ({tfm}) tests on *nix - https://github.com/mono/mono/issues/13969");
  continue;
  }
 
- Information($"Running for {projectName} ({fw}) ...");
+ Information($"Running for {projectName} ({tfm}) ...");
 
  DotNetTest(c => ApplySetting(c)
  .SetProjectFile(project)
- .SetFramework(fw)
+ .SetFramework(tfm)
  .EnableNoBuild()
  .EnableNoRestore()
  .When(Parameters.PublishTestResults, _ => _

diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
@@ -6,7 +6,9 @@
  <IsPackable>False</IsPackable>
  <NoWarn>$(NoWarn);CS0649;CS0169;SYSLIB0011</NoWarn>
  <NukeTelemetryVersion>1</NukeTelemetryVersion>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
+ <!-- See https://github.com/nuke-build/nuke/issues/818 -->
+ <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
  <!-- Necessary for Microsoft.DotNet.GenAPI.Tool -->
  <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json</RestoreAdditionalProjectSources>
  </PropertyGroup>

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net6.0;netstandard2.0;net461</TargetFrameworks>
+ <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0</TargetFrameworks>
  <PackageId>Avalonia</PackageId>
  </PropertyGroup>
 

diff --git a/samples/AppWithoutLifetime/AppWithoutLifetime.csproj b/samples/AppWithoutLifetime/AppWithoutLifetime.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <OutputType>WinExe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
  <Nullable>enable</Nullable>
  <ApplicationManifest>app.manifest</ApplicationManifest>
  </PropertyGroup>

diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
  <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />

diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>net7.0-android</TargetFramework>
+ <TargetFramework>$(AvsCurrentAndroidTargetFramework)</TargetFramework>
  <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
  <OutputType>Exe</OutputType>
  <Nullable>enable</Nullable>
  <ApplicationId>com.Avalonia.ControlCatalog</ApplicationId>
  <ApplicationVersion>1</ApplicationVersion>
  <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
  <AndroidPackageFormat>apk</AndroidPackageFormat>
- <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
  </PropertyGroup>
  <ItemGroup>
  <AndroidResource Include="..\..\build\Assets\Icon.png">

diff --git a/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj b/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(AvsCurrentBrowserTargetFramework)</TargetFramework>
  <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
  <Nullable>enable</Nullable>
  <EmccTotalMemory>16777216</EmccTotalMemory>

diff --git a/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj b/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(AvsCurrentBrowserTargetFramework)</TargetFramework>
  <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
  <WasmMainJSPath>AppBundle/main.js</WasmMainJSPath>
  <OutputType>Exe</OutputType>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
  <WasmRuntimeAssetsLocation>./</WasmRuntimeAssetsLocation>
  </PropertyGroup>
 

diff --git a/samples/ControlCatalog.Browser/EmbedSample.Browser.cs b/samples/ControlCatalog.Browser/EmbedSample.Browser.cs
@@ -21,14 +21,17 @@ public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func
  }
  else
  {
- var defaultHandle = (JSObjectControlHandle)createDefault();
+ var parentContainer = (JSObjectControlHandle)createDefault();
 
- _ = JSHost.ImportAsync("embed.js", "./embed.js").ContinueWith(_ =>
- {
- EmbedInterop.AddAppButton(defaultHandle.Object);
- }, TaskScheduler.FromCurrentSynchronizationContext());
+ AddButton(parentContainer.Object);
+
+ return parentContainer;
 
- return defaultHandle;
+ static async void AddButton(JSObject parent)
+ {
+ await JSHost.ImportAsync("embed.js", "./embed.js");
+ EmbedInterop.AddAppButton(parent);
+ } 
  }
  }
 }