From 6b812c8468dcf4bc37ba494d77db204ec6f9e5ce Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Sat, 21 Dec 2024 15:18:18 +0100
Subject: [PATCH] Fix double build of Avalonia.Build.Tasks (#17813)

---
 packages/Avalonia/Avalonia.csproj              | 7 ++-----
 src/Avalonia.Base/Avalonia.Base.csproj         | 4 +++-
 src/Avalonia.MicroCom/Avalonia.MicroCom.csproj | 9 +++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index d25647b01c..daf5c47f60 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -7,11 +7,8 @@
   <ItemGroup>
       <PackageReference Include="Avalonia.BuildServices" Version="0.0.29" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
-      <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
-        <PrivateAssets>all</PrivateAssets>
-        <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-        <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
-      </ProjectReference>
+      <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj"
+                        PrivateAssets="all" />
       <ProjectReference Include="..\..\src\tools\Avalonia.Generators\Avalonia.Generators.csproj"
                         ReferenceOutputAssembly="false"
                         PrivateAssets="all"
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index ce2d9ce9bc..c782bff011 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -64,6 +64,8 @@
   </ItemGroup>
   
   <ItemGroup Label="Build dependency">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"
+                      ReferenceOutputAssembly="false"
+                      PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
index f6a0f6e859..035b0b4cc6 100644
--- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@@ -5,12 +5,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MicroCom.Runtime" Version="0.11.0" />
-    <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <ExcludeAssets>all</ExcludeAssets>
-      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
-    </ProjectReference>
+    <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"
+                      ReferenceOutputAssembly="false"
+                      PrivateAssets="all" />
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\TrimmingEnable.props" />