From cb3f93b6852058891cb53d05953a21e590a77406 Mon Sep 17 00:00:00 2001
From: Evan <109839359+Evan260@users.noreply.github.com>
Date: Fri, 11 Sep 2026 12:18:56 +0000
Subject: [PATCH] Run GenerateAvaloniaResources before
 _InjectAvaloniaAdditionalFiles (#22175)

GenerateAvaloniaResources adds AvaloniaXaml items to AvaloniaResource, which
_InjectAvaloniaAdditionalFiles then reads to build AvaloniaResourcePaths.
Nothing ordered the two, so the property could be built from a partial list
depending on which target MSBuild scheduled first.
---
 packages/Avalonia/AvaloniaBuildTasks.targets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index ec1ef7b46c..66078ff41e 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -39,7 +39,11 @@
                       Condition="'$(ApplicationIcon)' != ''" />
   </ItemGroup>
 
-  <Target Name="_InjectAvaloniaAdditionalFiles" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
+  <!-- GenerateAvaloniaResources adds AvaloniaXaml to AvaloniaResource, so it has to run first
+       or the items read below are incomplete. -->
+  <Target Name="_InjectAvaloniaAdditionalFiles"
+          BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun"
+          DependsOnTargets="GenerateAvaloniaResources">
     <!-- Include AvaloniaXaml and AvaloniaResource (XAML only) as a Roslyn-visible additional files. -->
     <!-- This is necessary to use these files in source generators and other Roslyn-based extension. -->
     <!-- AdditionalFiles ensures that each file has Compilation available for them. -->