From 4727bc86a4d6fa2c009ae9932eef3a668a358e60 Mon Sep 17 00:00:00 2001
From: shihaonan369 <shihaonan369@live.com>
Date: Thu, 14 May 2020 14:37:15 +0800
Subject: [vcpkg] Fix nuget package import failed. (#11093)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix bug that caused exported nuget package import failure.

* Give priority to nuget package to set $(VcpkgRoot).

* [vcpkg] Remove trailing whitespace

* fix nuget package import failed

Co-authored-by: 施浩男 <shihaonan@zhongli360.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
---
 toolsrc/src/vcpkg/export.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/src')

diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp
index b41d88dc1..be968e4c9 100644
--- a/toolsrc/src/vcpkg/export.cpp
+++ b/toolsrc/src/vcpkg/export.cpp
@@ -62,7 +62,7 @@ namespace vcpkg::Export
         return Strings::format(R"###(
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VcpkgRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\</VcpkgRoot>
+    <VcpkgRoot></VcpkgRoot>
   </PropertyGroup>
   <Import Condition="Exists('%s')" Project="%s" />
 </Project>
-- 
cgit v1.2.3