Fix NativeAOT not using the XAML compilation output (#14966)

AvaloniaUI · Mar 15, 2024 · 0aba3ed · 0aba3ed
1 parent eca012e
commit 0aba3ed
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -161,6 +161,21 @@
       <_DebugSymbolsIntermediatePath Include="@(_AvaloniaXamlCompiledSymbols)"/>
     </ItemGroup>
   </Target>
+
+  <!-- For some reason the IL Compiler hardcodes $(IntermediateOutputPath)$(TargetName)$(TargetExt) instead of using @(IntermediateAssembly), change that to our assembly. -->
+  <Target Name="InjectIlcAvaloniaXamlOutput"
+          DependsOnTargets="InjectAvaloniaXamlOutput"
+          AfterTargets="ComputeIlcCompileInputs"
+          BeforeTargets="PrepareForILLink"
+          Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false">
+    <ItemGroup>
+      <ManagedBinary Remove="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
+      <ManagedBinary Include="@(_AvaloniaXamlCompiledAssembly)" />
+
+      <IlcCompileInput Remove="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
+      <IlcCompileInput Include="@(_AvaloniaXamlCompiledAssembly)" />
+    </ItemGroup>
+  </Target>
 
   <Target Name="Avalonia_CollectUpToDateCheckOutputDesignTime" Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false" 
           BeforeTargets="CollectUpToDateCheckOutputDesignTime" DependsOnTargets="PrepareToCompileAvaloniaXaml">