diff options
| author | shihaonan369 <shihaonan369@live.com> | 2020-05-14 14:37:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 23:37:15 -0700 |
| commit | 4727bc86a4d6fa2c009ae9932eef3a668a358e60 (patch) | |
| tree | 938e0541c9d2ee1765a4f87212870e4e490090cf /toolsrc/src | |
| parent | 430a10ff3582a16b0f4c5cc8dddac245e9596702 (diff) | |
| download | vcpkg-4727bc86a4d6fa2c009ae9932eef3a668a358e60.tar.gz vcpkg-4727bc86a4d6fa2c009ae9932eef3a668a358e60.zip | |
[vcpkg] Fix nuget package import failed. (#11093)
* 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>
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/export.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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> |