From 77af264118522788e24e463309220f97dcff0a79 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 18 May 2019 18:15:31 -0700
Subject: [vcpkg] Fix regression in `--debug`. Remove old `features`
 featureflag. (#6507)

---
 toolsrc/include/vcpkg/globalstate.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h
index 2026ea369..263b5f80c 100644
--- a/toolsrc/include/vcpkg/globalstate.h
+++ b/toolsrc/include/vcpkg/globalstate.h
@@ -13,8 +13,6 @@ namespace vcpkg
         static Util::LockGuarded<Chrono::ElapsedTimer> timer;
         static Util::LockGuarded<std::string> g_surveydate;
 
-        static std::atomic<bool> debugging;
-        static std::atomic<bool> feature_packages;
         static std::atomic<bool> g_binary_caching;
 
         static std::atomic<int> g_init_console_cp;
-- 
cgit v1.2.3


From 17623739df4796353d5eb4c9a2ec513c679022e0 Mon Sep 17 00:00:00 2001
From: Sean Warren <s.warren@garvan.org.au>
Date: Thu, 23 May 2019 14:24:02 -0400
Subject: [toolsrc] Optionally allow vcpkg to clean after each build (#6522)

* [toolsrc] Optionally allow vcpkg to clean packages, buildtrees and downloads after each build
Adds switch --clean-after-build

* [toolsrc] Clarify that --clean-after-build deletes downloads

* [toolsrc] Revert changes to ci download caching behaviour
---
 toolsrc/include/vcpkg/build.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index f27e9d67b..9044cb556 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -51,6 +51,12 @@ namespace vcpkg::Build
         YES
     };
 
+    enum class CleanDownloads
+    {
+        NO = 0,
+        YES
+    };
+
     enum class ConfigurationType
     {
         DEBUG,
@@ -82,6 +88,7 @@ namespace vcpkg::Build
         AllowDownloads allow_downloads;
         CleanBuildtrees clean_buildtrees;
         CleanPackages clean_packages;
+        CleanDownloads clean_downloads;
         DownloadTool download_tool;
         BinaryCaching binary_caching;
         FailOnTombstone fail_on_tombstone;
-- 
cgit v1.2.3