Skip to content

Commit b38f047

Browse files
authored
Merge pull request #6569 from Takoooooo/fix-generateAvaloniaResources
Fix avalonia resource generation on resource deletion
2 parents ee69220 + b0a40a2 commit b38f047

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

packages/Avalonia/AvaloniaBuildTasks.targets

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,24 @@
4242
</Target>
4343

4444
<PropertyGroup>
45-
<BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences</BuildAvaloniaResourcesDependsOn>
45+
<BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences;_GenerateAvaloniaResourcesDependencyCache</BuildAvaloniaResourcesDependsOn>
4646
</PropertyGroup>
4747

48+
<Target Name="_GenerateAvaloniaResourcesDependencyCache" BeforeTargets="GenerateAvaloniaResources">
49+
<ItemGroup>
50+
<CustomAdditionalGenerateAvaloniaResourcesInputs Include="$(IntermediateOutputPath)/Avalonia/Resources.Inputs.cache" />
51+
</ItemGroup>
52+
53+
<Hash ItemsToHash="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)">
54+
<Output TaskParameter="HashResult" PropertyName="AvaloniaResourcesDependencyHash" />
55+
</Hash>
56+
57+
<WriteLinesToFile Overwrite="true" File="$(IntermediateOutputPath)/Avalonia/Resources.Inputs.cache" Lines="$(AvaloniaResourcesDependencyHash)" WriteOnlyWhenDifferent="True" />
58+
</Target>
59+
4860
<Target Name="GenerateAvaloniaResources"
4961
BeforeTargets="CoreCompile;CoreResGen"
50-
Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)"
62+
Inputs="@(AvaloniaResource);@(AvaloniaXaml);@(CustomAdditionalGenerateAvaloniaResourcesInputs);$(MSBuildAllProjects)"
5163
Outputs="$(AvaloniaResourcesTemporaryFilePath)"
5264
DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
5365
<ItemGroup>

0 commit comments

Comments
 (0)