Skip to content

Fix Visual Studio deadlock caused by restore target calls in BeforeResolveReferences #15137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix Visual Studio deadlock caused by restore target calls in BeforeResolveReferences #15137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
381f3e6
Initial plan
Copilot Sep 11, 2025
18cf6f9
Remove problematic restore calls from BeforeResolveReferences target
Copilot Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions vnext/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please confirm this actually happens and the target's removal is fully transparent to the user?

-->

<!-- This ensures NuGet restores use the nuget config's feed and not any pre-installed files. -->
<PropertyGroup>
Expand Down
26 changes: 10 additions & 16 deletions vnext/PropertySheets/External/Microsoft.ReactNative.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>