From 632fb911b5b2e685ed4c38000370bc1a8112f252 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 25 Jul 2024 17:03:46 +0500
Subject: [PATCH] Update AvaloniaBuildTasks.targets (#16427)

Co-authored-by: Steven Kirk <grokys@users.noreply.github.com>
---
 packages/Avalonia/AvaloniaBuildTasks.targets | 26 ++++++--------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 05984271b2..9d68af031f 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -135,6 +135,14 @@
     Outputs="@(CompileAvaloniaXamlOutputs)"
     Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(DesignTimeBuild) != true AND $(EnableAvaloniaXamlCompilation) != false">
 
+    <!--
+      $(IntermediateOutputPath)/Avalonia/references is using from AvaloniaVS for retrieve library references.
+    -->
+    <WriteLinesToFile
+      File="$(IntermediateOutputPath)/Avalonia/references"
+      Lines="@(ReferencePathWithRefAssemblies)"
+      Overwrite="true" />
+
     <CompileAvaloniaXamlTask
       AssemblyFile="@(IntermediateAssembly)"
       References="@(ReferencePathWithRefAssemblies)"
@@ -245,22 +253,4 @@
       '$(SkipCopyBuildProduct)' != 'true'">
     <Delete Files="$(TargetRefPath)" Condition="Exists('$(TargetRefPath)')" />
   </Target>
-
-  <!--
-  $(IntermediateOutputPath)/Avalonia/references is using from AvaloniaVS for retrieve library references.
-  This target generate $(IntermediateOutputPath)/Avalonia/references for in xplat Template
-  (see: https://github.com/AvaloniaUI/avalonia-dotnet-templates/tree/e4a489ae828f005f625145c563785174403e267c/templates/csharp/xplat).
-  -->
-  <Target Name="GenerateIntellisenseReferences"
-          AfterTargets="AfterCompile"
-          Condition="('@(AvaloniaResource->Count())' == 0) and ('@(AvaloniaXaml->Count())' == 0)">
-    <PropertyGroup>
-      <AvaloniaXamlReferencesTemporaryFilePath Condition="'$(AvaloniaXamlReferencesTemporaryFilePath)' == ''">$(IntermediateOutputPath)/Avalonia/references</AvaloniaXamlReferencesTemporaryFilePath>
-    </PropertyGroup>
-    <WriteLinesToFile
-      Condition="'$(_AvaloniaForceInternalMSBuild)' != 'true'"
-      File="$(AvaloniaXamlReferencesTemporaryFilePath)"
-      Lines="@(ReferencePathWithRefAssemblies)"
-      Overwrite="true" />
-  </Target>
 </Project>