From 381f3e64763205cfc1768ee4b00d117b549c666f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 11 Sep 2025 04:24:46 +0000
Subject: [PATCH 1/2] Initial plan


From 18cf6f9bcf0fffa6005971dec3e6cd1854fe74ce Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 11 Sep 2025 04:32:57 +0000
Subject: [PATCH 2/2] Remove problematic restore calls from
 BeforeResolveReferences target

- Remove MSBuild calls to Restore target from BeforeResolveReferences in VS builds
- Add explanatory comments documenting why restore calls cause deadlocks
- Preserve all other functionality while fixing the deadlock issue
- Visual Studio will handle NuGet restoration through its own mechanisms

Co-authored-by: anupriya13 <54227869+anupriya13@users.noreply.github.com>
---
 vnext/Directory.Build.targets                 | 26 +++++++------------
 .../Microsoft.ReactNative.Common.targets      | 26 +++++++------------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets
index a2ab4fd389c..d3d50f073d7 100644
--- a/vnext/Directory.Build.targets
+++ b/vnext/Directory.Build.targets
@@ -4,22 +4,16 @@
   <!-- This import will noop when customer code is built. This import is here to help building the bits in the react-native-windows repository. -->
   <Import Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../')))" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
-  <!--Allow implicitly restoring NuGet dependencies in C++ projects using the Visual Studio IDE.-->
-  <Target Name="BeforeResolveReferences" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(MSBuildProjectExtension)' == '.vcxproj'">
-    <!--
-      Ensure restoring of PackageReference dependencies.
-    -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackageReference" Condition="@(PackageReference->Count()) &gt; 0" />
-
-    <!--
-      Ensure restoring of packages.config dependencies.
-
-      RestoreProjectStyle=PackagesConfig    - Required to use the packages.config mechanism
-      RestorePackagesConfig=true            - Required to use the packages.config mechanism
-      RestoreUseStaticGraphEvaluation=false - Override setting from Directory.Build.props
-    -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true;RestoreUseStaticGraphEvaluation=false" />
-  </Target>
+  <!--
+    Note: Removed implicit NuGet restore calls from BeforeResolveReferences target.
+    
+    Calling the restore target during Visual Studio builds can cause deadlocks because:
+    1. It accesses UI thread-bound components without proper JTF synchronization
+    2. It violates the restore/build contract (restore must complete before build starts)
+    3. Network calls during restore on UI thread cause performance issues and potential deadlocks
+    
+    Visual Studio will handle NuGet package restoration automatically through its own mechanisms.
+  -->
 
   <!-- This ensures NuGet restores use the nuget config's feed and not any pre-installed files. -->
   <PropertyGroup>
diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Common.targets b/vnext/PropertySheets/External/Microsoft.ReactNative.Common.targets
index c6b1c6196ae..eea3002c0da 100644
--- a/vnext/PropertySheets/External/Microsoft.ReactNative.Common.targets
+++ b/vnext/PropertySheets/External/Microsoft.ReactNative.Common.targets
@@ -14,21 +14,15 @@
   </Target>
 
   <!-- Should match entry in $(ReactNativeWindowsDir)vnext\Directory.Build.targets -->
-  <!--Allow implicitly restoring NuGet dependencies in C++ projects using the Visual Studio IDE.-->
-  <Target Name="BeforeResolveReferences" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(MSBuildProjectExtension)' == '.vcxproj'">
-    <!--
-      Ensure restoring of PackageReference dependencies.
-    -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackageReference" />
-
-    <!--
-      Ensure restoring of packages.config dependencies.
-
-      RestoreProjectStyle=PackagesConfig    - Required to use the packages.config mechanism
-      RestorePackagesConfig=true            - Required to use the packages.config mechanism
-      RestoreUseStaticGraphEvaluation=false - Override setting from Microsoft.ReactNative.Common.props
-    -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true;RestoreUseStaticGraphEvaluation=false" />
-  </Target>
+  <!--
+    Note: Removed implicit NuGet restore calls from BeforeResolveReferences target.
+    
+    Calling the restore target during Visual Studio builds can cause deadlocks because:
+    1. It accesses UI thread-bound components without proper JTF synchronization
+    2. It violates the restore/build contract (restore must complete before build starts)
+    3. Network calls during restore on UI thread cause performance issues and potential deadlocks
+    
+    Visual Studio will handle NuGet package restoration automatically through its own mechanisms.
+  -->
 
 </Project>
\ No newline at end of file