Stop the build from trying to import vcpkg during nuget restore

microsoft · Jul 20, 2024 · 6455565 · 6455565
1 parent 3c5800f
commit 6455565
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/common.build.post.props b/src/common.build.post.props
@@ -115,5 +115,6 @@
   </ItemDefinitionGroup>
 
   <!-- For C++ projects, bring in the vcpkg targets at the end -->
-  <Import Project="$(VcpkgRoot)/scripts/buildsystems/msbuild/vcpkg.targets" Condition="'$(MSBuildProjectExtension)'=='.vcxproj'" />
+  <!-- We check NuGetRestoreTargets to determine if we are in a NuGet restore step; if we are, skip vcpkg -->
+  <Import Project="$(VcpkgRoot)/scripts/buildsystems/msbuild/vcpkg.targets" Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(NuGetRestoreTargets)'==''" />
 </Project>
diff --git a/src/common.build.pre.props b/src/common.build.pre.props
@@ -283,5 +283,6 @@
     <VCPkgLocalAppDataDisabled>true</VCPkgLocalAppDataDisabled>
   </PropertyGroup>
 
-  <Import Project="$(VcpkgRoot)/scripts/buildsystems/msbuild/vcpkg.props" Condition="'$(MSBuildProjectExtension)'=='.vcxproj'" />
+  <!-- We check NuGetRestoreTargets to determine if we are in a NuGet restore step; if we are, skip vcpkg -->
+  <Import Project="$(VcpkgRoot)/scripts/buildsystems/msbuild/vcpkg.props" Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(NuGetRestoreTargets)'==''" />
 </Project>