From 21d9ade43de48db7f4b96214cacce4e001e0c2f7 Mon Sep 17 00:00:00 2001
From: PhoebeHui <v-phma@microsoft.com>
Date: Mon, 4 Nov 2019 17:57:52 -0800
Subject: [PATCH 1/3] [libplist] Upgrade to 1.2.137

---
 ports/libplist/CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++++
 ports/libplist/CONTROL        |  2 +-
 ports/libplist/portfile.cmake | 29 +++++++++++------------------
 3 files changed, 47 insertions(+), 19 deletions(-)
 create mode 100644 ports/libplist/CMakeLists.txt

diff --git a/ports/libplist/CMakeLists.txt b/ports/libplist/CMakeLists.txt
new file mode 100644
index 00000000000000..e7c5c09abc3096
--- /dev/null
+++ b/ports/libplist/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.8)
+project(plist C)
+
+file(GLOB_RECURSE PLIST_TOOLS_SRC tools/*.c)
+
+file(GLOB_RECURSE PLIST_HEADER include/plist/*.h)
+file(GLOB_RECURSE PLIST_SRC src/*.c)
+
+file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h)
+file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c)
+
+add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})
+target_include_directories(plist PRIVATE src include libcnary/include)
+
+if(WIN32)
+    target_compile_options(plist PRIVATE -W3 -WX- -sdl-)
+    target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS)
+endif()
+
+install(
+    TARGETS plist
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/libplist.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc
+    @ONLY
+)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc
+    DESTINATION lib/pkgconfig)
+
+install(FILES ${PLIST_HEADER} DESTINATION include/plist)
\ No newline at end of file
diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL
index 9189b4f488a16a..65c9ff151914d1 100644
--- a/ports/libplist/CONTROL
+++ b/ports/libplist/CONTROL
@@ -1,3 +1,3 @@
 Source: libplist
-Version: 1.2.77
+Version: 1.2.137
 Description: A library to handle Apple Property List format in binary or XML 
diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake
index b2b8dde80fe4fd..61312689672c93 100644
--- a/ports/libplist/portfile.cmake
+++ b/ports/libplist/portfile.cmake
@@ -1,31 +1,24 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_DYNAMIC_CRT ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/libplist
-    REF f279ef534ab5adeb81f063dee5e8a8fc3ca6d3ab
-    SHA512 52001a46935693e3ac5f0b8c3d13d9bf51c5f34189f6f006bd697d7e965f402460060708c4fb54ed43f49a217ac442fcb8dca252fcbccd3e6a154b6c9a8c2104
+    REF f1b85c037693b5749a38473aa6c013ca45a663bf # v1.2.137
+    SHA512 b38d6dc3f4d480d35d847afeab4c90f90edf249fe506c95a30af40acfb7ecbd978334fa5557cf1421716054db748f6d1d540f2405001b9b597cd56cfbfe2c671
     HEAD_REF msvc-master
     PATCHES dllexport.patch
 )
 
-set(ENV{_CL_} "$ENV{_CL_} /GL-")
-set(ENV{_LINK_} "$ENV{_LINK_} /LTCG:OFF")
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    set(ENV{_LINK_} "$ENV{_LINK_} /APPCONTAINER")
-endif()
+configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
 
-vcpkg_install_msbuild(
+vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PROJECT_SUBPATH libplist.sln
-    INCLUDES_SUBPATH include
-    LICENSE_SUBPATH COPYING.lesser
-    REMOVE_ROOT_INCLUDES
+    PREFER_NINJA
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
\ No newline at end of file
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

From 8130e8a14fec195fd0974ae27fc3c1b7ab55bb0d Mon Sep 17 00:00:00 2001
From: PhoebeHui <v-phma@microsoft.com>
Date: Thu, 7 Nov 2019 00:32:17 -0800
Subject: [PATCH 2/3] Update CMakeLists.txt

---
 ports/libplist/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/libplist/CMakeLists.txt b/ports/libplist/CMakeLists.txt
index e7c5c09abc3096..0752c2e5b38205 100644
--- a/ports/libplist/CMakeLists.txt
+++ b/ports/libplist/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.8)
 project(plist C)
 
-file(GLOB_RECURSE PLIST_TOOLS_SRC tools/*.c)
-
 file(GLOB_RECURSE PLIST_HEADER include/plist/*.h)
 file(GLOB_RECURSE PLIST_SRC src/*.c)
 

From fbe77e1235a9249ce862da7697a6cfbd0dbb7385 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 6 Dec 2019 02:36:57 -0800
Subject: [PATCH 3/3] [libplist] Update build status

---
 scripts/ci.baseline.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 83351593b0808f..ce2be6e19a9368 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -832,9 +832,6 @@ libpff:x64-linux=fail
 libpff:x64-osx=fail
 libpff:x64-uwp=fail
 libpff:x64-windows-static=fail
-libplist:arm64-windows=fail
-libplist:arm-uwp=fail
-libplist:x64-linux=fail
 libplist:x64-osx=fail
 libplist:x64-windows-static=fail
 libpng-apng:arm64-windows      = skip
@@ -898,7 +895,10 @@ libusb:arm-uwp=fail
 libusb:x64-linux=fail
 libusb:x64-osx=fail
 libusb:x64-uwp=fail
+libusbmuxd:arm64-windows=fail
+libusbmuxd:arm-uwp=fail
 libusbmuxd:x64-uwp=fail
+libusbmuxd:x64-linux=fail
 libusb-win32:arm64-windows=fail
 libusb-win32:arm-uwp=fail
 libusb-win32:x64-linux=fail