From 8f833dbb2fba5d9a4df0946eef1122bc4f097d87 Mon Sep 17 00:00:00 2001
From: Takoooooo <dan.pan2012@yandex.ru>
Date: Thu, 9 Sep 2021 19:16:32 +0300
Subject: [PATCH 1/4] it works

---
 packages/Avalonia/AvaloniaBuildTasks.targets | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 45a7f1aa44..a18930527f 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -42,12 +42,20 @@
   </Target>
   
   <PropertyGroup>
-    <BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences</BuildAvaloniaResourcesDependsOn>
+    <BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences;ReGenerateAvaloniaResourcesOnResourceDeletion</BuildAvaloniaResourcesDependsOn>
   </PropertyGroup>
   
+  <Target Name="ReGenerateAvaloniaResourcesOnResourceDeletion" BeforeTargets="GenerateAvaloniaResources">
+    <Hash ItemsToHash="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)">
+      <Output TaskParameter="HashResult" PropertyName="UpdatedInputCacheContents" />
+    </Hash>
+
+    <WriteLinesToFile Overwrite="true" File="$(MSBuildProjectFile).Inputs.cache" Lines="$(UpdatedInputCacheContents)" WriteOnlyWhenDifferent="True" />
+  </Target>
+  
   <Target Name="GenerateAvaloniaResources" 
           BeforeTargets="CoreCompile;CoreResGen"
-          Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)"
+          Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildProjectFile).Inputs.cache;$(MSBuildAllProjects)"
           Outputs="$(AvaloniaResourcesTemporaryFilePath)"
 	  DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
     <ItemGroup>

From 890eabbd1fb2e211aaadb3a8bb8b3cb1cf6b4e68 Mon Sep 17 00:00:00 2001
From: Takoooooo <dan.pan2012@yandex.ru>
Date: Fri, 10 Sep 2021 11:27:17 +0300
Subject: [PATCH 2/4] upd

---
 packages/Avalonia/AvaloniaBuildTasks.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index a18930527f..7fbe939390 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -50,12 +50,12 @@
       <Output TaskParameter="HashResult" PropertyName="UpdatedInputCacheContents" />
     </Hash>
 
-    <WriteLinesToFile Overwrite="true" File="$(MSBuildProjectFile).Inputs.cache" Lines="$(UpdatedInputCacheContents)" WriteOnlyWhenDifferent="True" />
+    <WriteLinesToFile Overwrite="true" File="$(IntermediateOutputPath)/Avalonia/Inputs.cache" Lines="$(UpdatedInputCacheContents)" WriteOnlyWhenDifferent="True" />
   </Target>
   
   <Target Name="GenerateAvaloniaResources" 
           BeforeTargets="CoreCompile;CoreResGen"
-          Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildProjectFile).Inputs.cache;$(MSBuildAllProjects)"
+          Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(IntermediateOutputPath)/Avalonia/Inputs.cache;$(MSBuildAllProjects)"
           Outputs="$(AvaloniaResourcesTemporaryFilePath)"
 	  DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
     <ItemGroup>

From 1e918b1ed4dccf08e3504f4f515c3095b0bde9d6 Mon Sep 17 00:00:00 2001
From: Takoooooo <dan.pan2012@yandex.ru>
Date: Mon, 20 Sep 2021 12:30:14 +0300
Subject: [PATCH 3/4] upd

---
 packages/Avalonia/AvaloniaBuildTasks.targets | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 7fbe939390..f32ffffa12 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -42,20 +42,24 @@
   </Target>
   
   <PropertyGroup>
-    <BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences;ReGenerateAvaloniaResourcesOnResourceDeletion</BuildAvaloniaResourcesDependsOn>
+    <BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences;_GenerateAvaloniaResourcesDependencyCache</BuildAvaloniaResourcesDependsOn>
   </PropertyGroup>
   
-  <Target Name="ReGenerateAvaloniaResourcesOnResourceDeletion" BeforeTargets="GenerateAvaloniaResources">
+  <Target Name="_GenerateAvaloniaResourcesDependencyCache" BeforeTargets="GenerateAvaloniaResources">
+    <ItemGroup>
+      <CustomAdditionalGenerateAvaloniaResourcesInputs Include="$(IntermediateOutputPath)/Avalonia/Inputs.cache" />
+    </ItemGroup>
+    
     <Hash ItemsToHash="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)">
-      <Output TaskParameter="HashResult" PropertyName="UpdatedInputCacheContents" />
+      <Output TaskParameter="HashResult" PropertyName="AvaloniaResourcesDependencyHash" />
     </Hash>
 
-    <WriteLinesToFile Overwrite="true" File="$(IntermediateOutputPath)/Avalonia/Inputs.cache" Lines="$(UpdatedInputCacheContents)" WriteOnlyWhenDifferent="True" />
+    <WriteLinesToFile Overwrite="true" File="@(CustomAdditionalGenerateAvaloniaResourcesInputs)" Lines="$(AvaloniaResourcesDependencyHash)" WriteOnlyWhenDifferent="True" />
   </Target>
   
   <Target Name="GenerateAvaloniaResources" 
           BeforeTargets="CoreCompile;CoreResGen"
-          Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(IntermediateOutputPath)/Avalonia/Inputs.cache;$(MSBuildAllProjects)"
+          Inputs="@(AvaloniaResource);@(AvaloniaXaml);@(CustomAdditionalGenerateAvaloniaResourcesInputs);$(MSBuildAllProjects)"
           Outputs="$(AvaloniaResourcesTemporaryFilePath)"
 	  DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
     <ItemGroup>

From 55de8084a14d0f6e9886ab0d90580fcb1e930ff3 Mon Sep 17 00:00:00 2001
From: Takoooooo <dan.pan2012@yandex.ru>
Date: Mon, 20 Sep 2021 12:41:38 +0300
Subject: [PATCH 4/4] upd

---
 packages/Avalonia/AvaloniaBuildTasks.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index f32ffffa12..de3830ffea 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -47,14 +47,14 @@
   
   <Target Name="_GenerateAvaloniaResourcesDependencyCache" BeforeTargets="GenerateAvaloniaResources">
     <ItemGroup>
-      <CustomAdditionalGenerateAvaloniaResourcesInputs Include="$(IntermediateOutputPath)/Avalonia/Inputs.cache" />
+      <CustomAdditionalGenerateAvaloniaResourcesInputs Include="$(IntermediateOutputPath)/Avalonia/Resources.Inputs.cache" />
     </ItemGroup>
     
     <Hash ItemsToHash="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)">
       <Output TaskParameter="HashResult" PropertyName="AvaloniaResourcesDependencyHash" />
     </Hash>
 
-    <WriteLinesToFile Overwrite="true" File="@(CustomAdditionalGenerateAvaloniaResourcesInputs)" Lines="$(AvaloniaResourcesDependencyHash)" WriteOnlyWhenDifferent="True" />
+    <WriteLinesToFile Overwrite="true" File="$(IntermediateOutputPath)/Avalonia/Resources.Inputs.cache" Lines="$(AvaloniaResourcesDependencyHash)" WriteOnlyWhenDifferent="True" />
   </Target>
   
   <Target Name="GenerateAvaloniaResources"