From 67f1bbe9715b31222a83745aed9f75a1f0450b19 Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Tue, 20 Aug 2024 14:50:23 -0700
Subject: [PATCH] Retry design time build fix while also keeping FUTDC working

---
 eng/targets/Imports.targets                                    | 3 +++
 .../ServiceHub.CoreComponents/CoreComponents.Shared.targets    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets
index 46eb0380702c3..2345b43e9f12f 100644
--- a/eng/targets/Imports.targets
+++ b/eng/targets/Imports.targets
@@ -392,5 +392,8 @@
     </ItemGroup>
   </Target>
 
+  <!-- Workaround for an issue where nested targets (e.g. GetCopyToPublishDirectoryItems in the SDK) call _SplitProjectReferencesByFileExistence without calling implict prerequisite AssignProjectConfiguration -->
+  <Target Name="Workaround_SplitProjectReferencesByFileExistence" BeforeTargets="_SplitProjectReferencesByFileExistence" DependsOnTargets="AssignProjectConfiguration" />
+
   <Import Project="DoNotGenerateSatelliteAssemblies_Workaround.targets" Condition="'$(GenerateSatelliteAssemblies)' == 'false'" />
 </Project>
diff --git a/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets b/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
index 8941a46f845bc..0bd122d3d7a83 100644
--- a/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
+++ b/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
@@ -137,7 +137,7 @@
     <Error Text="Crossgen2 failed with exit code $(_Crossgen2ErrorCode)." Condition="'$(_Crossgen2ErrorCode)' != '0'" />
   </Target>
 
-  <Target Name="PublishedProjectOutputGroup" DependsOnTargets="CalculateCrossgenInputs" Returns="@(_VsixItem)" Condition="'$(DesignTimeBuild)' != 'true'">
+  <Target Name="PublishedProjectOutputGroup" DependsOnTargets="CalculateCrossgenInputs" Returns="@(_VsixItem)">
     <PropertyGroup>
       <!-- 
         For BCL, we want to use the version provided by the runtime in VS, not the ones from the NuGet packages.