Fixed NativeAOT on .NET 9 (#15705)

Co-authored-by: Jumar Macato <[email protected]>
AvaloniaUI · May 14, 2024 · cfcc964 · cfcc964
1 parent e4e22ae
commit cfcc964
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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)" />