From cfcc964cb2b6ee2713c81e5f90023556023574c9 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 14 May 2024 04:33:55 +0200
Subject: [PATCH] Fixed NativeAOT on .NET 9 (#15705)

Co-authored-by: Jumar Macato <16554748+jmacato@users.noreply.github.com>
---
 packages/Avalonia/AvaloniaBuildTasks.targets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 99b3df9b1a..05984271b2 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -169,12 +169,16 @@
     </ItemGroup>
   </Target>
 
-  <!-- For some reason the IL Compiler hardcodes $(IntermediateOutputPath)$(TargetName)$(TargetExt) instead of using @(IntermediateAssembly), change that to our assembly. -->
+  <!--
+    For some reason the IL Compiler hardcodes $(IntermediateOutputPath)$(TargetName)$(TargetExt)
+    instead of using @(IntermediateAssembly), change that to our assembly.
+    This is fixed in .NET 9.0 (https://github.com/dotnet/runtime/pull/99732)
+  -->
   <Target Name="InjectIlcAvaloniaXamlOutput"
           DependsOnTargets="InjectAvaloniaXamlOutput"
           AfterTargets="ComputeIlcCompileInputs"
           BeforeTargets="PrepareForILLink"
-          Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false">
+          Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '9.0')) AND '@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false">
     <ItemGroup>
       <ManagedBinary Remove="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
       <ManagedBinary Include="@(_AvaloniaXamlCompiledAssembly)" />