Browse Source
Merge pull request #6569 from Takoooooo/fix-generateAvaloniaResources
Fix avalonia resource generation on resource deletion
pull/6619/head
Nikita Tsukanov
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
14 additions and
2 deletions
-
packages/Avalonia/AvaloniaBuildTasks.targets
|
|
|
@ -42,12 +42,24 @@ |
|
|
|
</Target> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences</BuildAvaloniaResourcesDependsOn> |
|
|
|
<BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences;_GenerateAvaloniaResourcesDependencyCache</BuildAvaloniaResourcesDependsOn> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<Target Name="_GenerateAvaloniaResourcesDependencyCache" BeforeTargets="GenerateAvaloniaResources"> |
|
|
|
<ItemGroup> |
|
|
|
<CustomAdditionalGenerateAvaloniaResourcesInputs Include="$(IntermediateOutputPath)/Avalonia/Resources.Inputs.cache" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<Hash ItemsToHash="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)"> |
|
|
|
<Output TaskParameter="HashResult" PropertyName="AvaloniaResourcesDependencyHash" /> |
|
|
|
</Hash> |
|
|
|
|
|
|
|
<WriteLinesToFile Overwrite="true" File="$(IntermediateOutputPath)/Avalonia/Resources.Inputs.cache" Lines="$(AvaloniaResourcesDependencyHash)" WriteOnlyWhenDifferent="True" /> |
|
|
|
</Target> |
|
|
|
|
|
|
|
<Target Name="GenerateAvaloniaResources" |
|
|
|
BeforeTargets="CoreCompile;CoreResGen" |
|
|
|
Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)" |
|
|
|
Inputs="@(AvaloniaResource);@(AvaloniaXaml);@(CustomAdditionalGenerateAvaloniaResourcesInputs);$(MSBuildAllProjects)" |
|
|
|
Outputs="$(AvaloniaResourcesTemporaryFilePath)" |
|
|
|
DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)"> |
|
|
|
<ItemGroup> |
|
|
|
|