From 9167511656715c81d01cc87af5db1835f026f5b6 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 25 Apr 2018 18:14:24 -0700
Subject: Fix #3170 issue with /permissive-

---
 toolsrc/include/tests.utils.h | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/tests.utils.h b/toolsrc/include/tests.utils.h
index 970506663..7f7ec9e88 100644
--- a/toolsrc/include/tests.utils.h
+++ b/toolsrc/include/tests.utils.h
@@ -12,10 +12,42 @@
 
 namespace Microsoft::VisualStudio::CppUnitTestFramework
 {
-    std::wstring ToString(const vcpkg::Dependencies::InstallPlanType& t);
-    std::wstring ToString(const vcpkg::Dependencies::RequestType& t);
-    std::wstring ToString(const vcpkg::PackageSpecParseResult& t);
-    std::wstring ToString(const vcpkg::PackageSpec& t);
+    template<>
+    std::wstring ToString<vcpkg::Dependencies::InstallPlanType>(const vcpkg::Dependencies::InstallPlanType& t)
+    {
+        switch (t)
+        {
+            case vcpkg::Dependencies::InstallPlanType::ALREADY_INSTALLED: return L"ALREADY_INSTALLED";
+            case vcpkg::Dependencies::InstallPlanType::BUILD_AND_INSTALL: return L"BUILD_AND_INSTALL";
+            case vcpkg::Dependencies::InstallPlanType::EXCLUDED: return L"EXCLUDED";
+            case vcpkg::Dependencies::InstallPlanType::UNKNOWN: return L"UNKNOWN";
+            default: return ToString(static_cast<int>(t));
+        }
+    }
+
+    template<>
+    std::wstring ToString<vcpkg::Dependencies::RequestType>(const vcpkg::Dependencies::RequestType& t)
+    {
+        switch (t)
+        {
+            case vcpkg::Dependencies::RequestType::AUTO_SELECTED: return L"AUTO_SELECTED";
+            case vcpkg::Dependencies::RequestType::USER_REQUESTED: return L"USER_REQUESTED";
+            case vcpkg::Dependencies::RequestType::UNKNOWN: return L"UNKNOWN";
+            default: return ToString(static_cast<int>(t));
+        }
+    }
+
+    template<>
+    std::wstring ToString<vcpkg::PackageSpecParseResult>(const vcpkg::PackageSpecParseResult& t)
+    {
+        return ToString(static_cast<uint32_t>(t));
+    }
+
+    template<>
+    std::wstring ToString<vcpkg::PackageSpec>(const vcpkg::PackageSpec& t)
+    {
+        return ToString(t.to_string());
+    }
 }
 
 std::unique_ptr<vcpkg::StatusParagraph> make_status_pgh(const char* name,
-- 
cgit v1.2.3


From a9d989ec056246ea320a56ca7d02b161a6fee387 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 28 Apr 2018 11:26:57 -0700
Subject: [vcpkg-integrate-install] Add vcpkg.path.txt to localappdata for more
 generic consumption.

---
 toolsrc/include/vcpkg/userconfig.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/userconfig.h b/toolsrc/include/vcpkg/userconfig.h
index 63b8e5481..d044f43ef 100644
--- a/toolsrc/include/vcpkg/userconfig.h
+++ b/toolsrc/include/vcpkg/userconfig.h
@@ -17,4 +17,6 @@ namespace vcpkg
 
         void try_write_data(Files::Filesystem& fs) const;
     };
+
+    fs::path get_user_dir();
 }
-- 
cgit v1.2.3