From 03784c64492aa062c9018f8483ce2221636d62f4 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:14:14 -0700
Subject: [PATCH 1/4] override zlib version

---
 vcpkg.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vcpkg.json b/vcpkg.json
index 1e586685dd..23cf27ffff 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -22,5 +22,11 @@
       "name": "wil",
       "platform": "windows"
     }
+  ],
+  "overrides": [
+    {
+      "name": "zlib",
+      "version": "1.2.12#2"
+    }
   ]
 }

From bbcb417fc5da9f8b42018c52ca6e0ecbe564be29 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:20:22 -0700
Subject: [PATCH 2/4]  shwitch baseline

---
 vcpkg.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/vcpkg.json b/vcpkg.json
index 23cf27ffff..aeadc6d37e 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-sdk-for-cpp",
   "version": "1.5.0",
-  "builtin-baseline": "f0aa678b7471497f1adedcc99f40e1599ad22f69",
+  "builtin-baseline": "659b6b5eeacb50ffe25856413960d231ce1a4b58",
   "dependencies": [
     {
       "name": "curl"
@@ -22,11 +22,5 @@
       "name": "wil",
       "platform": "windows"
     }
-  ],
-  "overrides": [
-    {
-      "name": "zlib",
-      "version": "1.2.12#2"
-    }
   ]
 }

From b5e6a40328b62992393f995d382f7dc811e51610 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:35:43 -0700
Subject: [PATCH 3/4] macro update

---
 cmake-modules/AzureVcpkg.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake
index 2789241fb5..2a5d4d960f 100644
--- a/cmake-modules/AzureVcpkg.cmake
+++ b/cmake-modules/AzureVcpkg.cmake
@@ -22,7 +22,7 @@ macro(az_vcpkg_integrate)
       if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG})
         # GET VCPKG FROM SOURCE
         #  User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
-        set(VCPKG_COMMIT_STRING f0aa678b7471497f1adedcc99f40e1599ad22f69) # default SDK tested commit
+        set(VCPKG_COMMIT_STRING 659b6b5eeacb50ffe25856413960d231ce1a4b58) # default SDK tested commit
         if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
           set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit
         endif()

From 402a87588ebe161f694b3fad44e48ad404ecd410 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:47:57 -0700
Subject: [PATCH 4/4] override zlib

---
 cmake-modules/AzureVcpkg.cmake | 2 +-
 vcpkg.json                     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake
index 2a5d4d960f..2789241fb5 100644
--- a/cmake-modules/AzureVcpkg.cmake
+++ b/cmake-modules/AzureVcpkg.cmake
@@ -22,7 +22,7 @@ macro(az_vcpkg_integrate)
       if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG})
         # GET VCPKG FROM SOURCE
         #  User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
-        set(VCPKG_COMMIT_STRING 659b6b5eeacb50ffe25856413960d231ce1a4b58) # default SDK tested commit
+        set(VCPKG_COMMIT_STRING f0aa678b7471497f1adedcc99f40e1599ad22f69) # default SDK tested commit
         if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
           set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit
         endif()
diff --git a/vcpkg.json b/vcpkg.json
index aeadc6d37e..23cf27ffff 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-sdk-for-cpp",
   "version": "1.5.0",
-  "builtin-baseline": "659b6b5eeacb50ffe25856413960d231ce1a4b58",
+  "builtin-baseline": "f0aa678b7471497f1adedcc99f40e1599ad22f69",
   "dependencies": [
     {
       "name": "curl"
@@ -22,5 +22,11 @@
       "name": "wil",
       "platform": "windows"
     }
+  ],
+  "overrides": [
+    {
+      "name": "zlib",
+      "version": "1.2.12#2"
+    }
   ]
 }