From 6b97dbfce2159e40d71fb69b1fe05c822c43aa90 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Fri, 11 Sep 2020 13:52:18 -0700
Subject: [vcpkg] Merge the vcpkg metadata uploader into the vcpkg binary
 (#13421)

---
 scripts/bootstrap.ps1 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 0d87d6ee8..5e750df38 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -379,7 +379,7 @@ $arguments = (
 "/verbosity:minimal",
 "/m",
 "/nologo",
-"`"$vcpkgBootstrapPath\dirs.proj`"") -join " "
+"`"$vcpkgBootstrapPath\vcpkg.vcxproj`"") -join " "
 
 function vcpkgInvokeCommandClean()
 {
@@ -432,9 +432,4 @@ Write-Verbose "Placing vcpkg.exe in the correct location"
 
 Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 
-if (-not $disableMetrics)
-{
-    Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe"
-}
-
 Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue
-- 
cgit v1.2.3