Browse Source

Fixed NativeAOT on .NET 9 (#15705)

Co-authored-by: Jumar Macato <16554748+jmacato@users.noreply.github.com>
release/11.1.0-rc1
Julien Lebosquain 2 years ago
committed by Steven Kirk
parent
commit
cbc1946da8
  1. 8
      packages/Avalonia/AvaloniaBuildTasks.targets

8
packages/Avalonia/AvaloniaBuildTasks.targets

@ -169,12 +169,16 @@
</ItemGroup> </ItemGroup>
</Target> </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" <Target Name="InjectIlcAvaloniaXamlOutput"
DependsOnTargets="InjectAvaloniaXamlOutput" DependsOnTargets="InjectAvaloniaXamlOutput"
AfterTargets="ComputeIlcCompileInputs" AfterTargets="ComputeIlcCompileInputs"
BeforeTargets="PrepareForILLink" BeforeTargets="PrepareForILLink"
Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false"> Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '9.0')) AND '@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false">
<ItemGroup> <ItemGroup>
<ManagedBinary Remove="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" /> <ManagedBinary Remove="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
<ManagedBinary Include="@(_AvaloniaXamlCompiledAssembly)" /> <ManagedBinary Include="@(_AvaloniaXamlCompiledAssembly)" />

Loading…
Cancel
Save