From aba829d9295cdee0e9589ee9997582e1e5062d18 Mon Sep 17 00:00:00 2001
From: JinmingHu <jinmhu@microsoft.com>
Date: Thu, 10 Oct 2019 01:41:51 +0800
Subject: [PATCH] [azure-storage-cpp]Upgrade to 7.0.0 (#8499)

---
 ports/azure-storage-cpp/CONTROL               |  2 +-
 .../azure-storage-cpp/builtin-uuid-osx.patch  | 40 -------------------
 ports/azure-storage-cpp/portfile.cmake        |  6 +--
 3 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 ports/azure-storage-cpp/builtin-uuid-osx.patch

diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
index 563c3d15f..d1b76a4f9 100644
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 6.1.0-2
+Version: 7.0.0
 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
 Description: Microsoft Azure Storage Client SDK for C++
   A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.
diff --git a/ports/azure-storage-cpp/builtin-uuid-osx.patch b/ports/azure-storage-cpp/builtin-uuid-osx.patch
deleted file mode 100644
index 1e2b918cc..000000000
--- a/ports/azure-storage-cpp/builtin-uuid-osx.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
-index 9171f8c..b2c7b93 100644
---- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
-+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
-@@ -13,6 +13,11 @@
- #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- #
- 
-+if (APPLE)
-+    set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/)
-+    set(CMAKE_OSX_FRAMEWORK_HEADERS ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers)
-+    set(UUID_LIBRARY "")
-+endif()
- 
- if (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
-   # in cache already
-@@ -39,6 +44,7 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
-       /opt/include
-       [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-       /usr/freeware/include
-+      ${CMAKE_OSX_FRAMEWORK_HEADERS}
-   )
- 
-   find_library(UUID_LIBRARY
-@@ -88,13 +94,13 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
-   set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
-   set(UUID_LIBRARIES ${UUID_LIBRARY})
- 
--  if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
-+  if (UUID_INCLUDE_DIRS AND (UUID_LIBRARIES OR APPLE))
-      set(UUID_FOUND TRUE)
-   endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
- 
-   if (UUID_FOUND)
-     if (NOT UUID_FIND_QUIETLY)
--      message(STATUS "Found UUID : ${UUID_LIBRARIES}")
-+      message(STATUS "Found UUID : ${UUID_INCLUDE_DIRS}  ${UUID_LIBRARIES}")
-     endif (NOT UUID_FIND_QUIETLY)
-   else (UUID_FOUND)
-     if (UUID_FIND_REQUIRED)
diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake
index b558fa51d..9f7ac2162 100644
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@@ -7,12 +7,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-storage-cpp
-    REF v6.1.0
-    SHA512 bc6a1da6287301b5bb5c31694d508c46447b71043d5b94a90ffe79b6dc045bc111ed0bcf3a7840e096ddc3ef6badbeef7fb905242e272a9f82f483d849a43e61
+    REF v7.0.0
+    SHA512 2187bd4d640ff1630f4f20d2717ea0219f7835e524b1db5b89563b5b525a34200a33693030d9e004db9cfe1df905b6c76ffd709f9e6cb2e2861ba1c1f8d062db
     HEAD_REF master
     PATCHES
-        # on osx use the uuid.h that is part of the osx sdk
-        builtin-uuid-osx.patch
         remove-gcov-dependency.patch
 )