Skip to content
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.

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

Remove usage of RestoreUseStaticGraphEvaluation #11509

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Remove usage of RestoreUseStaticGraphEvaluation",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
5 changes: 0 additions & 5 deletions vnext/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,4 @@
<OutputPath Condition="'$(MSBuildProjectExtension)' == '.csproj'">$(OutDir)</OutputPath>
</PropertyGroup>

<PropertyGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
<!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
<RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
</PropertyGroup>

</Project>
3 changes: 1 addition & 2 deletions vnext/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@

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" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true" />
</Target>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@

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" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true" />
</Target>

</Project>
4 changes: 0 additions & 4 deletions vnext/PropertySheets/NuGet.Cpp.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup Label="NuGet">
<!-- Should match entry in $(ReactNativeWindowsDir)vnext\Directory.Build.props -->
<!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
<RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>

<!-- Ensure PackageReference compatibility for any consuming projects/apps -->
<ResolveNuGetPackages>false</ResolveNuGetPackages>

Expand Down