From 22faad110626996c768c4e409cf0721337edcc87 Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Mon, 17 Oct 2022 17:50:32 -0700 Subject: [PATCH 1/6] vcpkg baseline --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 2789241fb5..77831bdaec 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 522aa94e9d261c7d7b2f079bf2591ca62df5c714) # 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 23cf27ffff..22c4392664 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": "522aa94e9d261c7d7b2f079bf2591ca62df5c714", "dependencies": [ { "name": "curl" @@ -22,11 +22,5 @@ "name": "wil", "platform": "windows" } - ], - "overrides": [ - { - "name": "zlib", - "version": "1.2.12#2" - } ] } From 16d7208e3501a2764278e0bf561f12531bfb69c6 Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:57:15 -0700 Subject: [PATCH 2/6] f4b262b259145adb2ab0116a390b08642489d32b --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 77831bdaec..1963bf7a6b 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 522aa94e9d261c7d7b2f079bf2591ca62df5c714) # default SDK tested commit + set(VCPKG_COMMIT_STRING f4b262b259145adb2ab0116a390b08642489d32b) # 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 22c4392664..14ee4c3792 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "522aa94e9d261c7d7b2f079bf2591ca62df5c714", + "builtin-baseline": "f4b262b259145adb2ab0116a390b08642489d32b", "dependencies": [ { "name": "curl" From d1c0e2d0393f2f17aaa38108ded37fde5f7ca5c1 Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:39:21 -0700 Subject: [PATCH 3/6] 79fa9d85cb4510b05c2657bd7ec8a6a2cb266dc5 --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 1963bf7a6b..82e82b0369 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 f4b262b259145adb2ab0116a390b08642489d32b) # default SDK tested commit + set(VCPKG_COMMIT_STRING 79fa9d85cb4510b05c2657bd7ec8a6a2cb266dc5) # 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 14ee4c3792..da777de28c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "f4b262b259145adb2ab0116a390b08642489d32b", + "builtin-baseline": "79fa9d85cb4510b05c2657bd7ec8a6a2cb266dc5", "dependencies": [ { "name": "curl" From d60caabdebbb846e661e2277bd2bda282e6338cf Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:46:20 -0700 Subject: [PATCH 4/6] 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98 --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 82e82b0369..272013686f 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 79fa9d85cb4510b05c2657bd7ec8a6a2cb266dc5) # default SDK tested commit + set(VCPKG_COMMIT_STRING 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98) # 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 da777de28c..490c99c9c1 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "79fa9d85cb4510b05c2657bd7ec8a6a2cb266dc5", + "builtin-baseline": "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", "dependencies": [ { "name": "curl" From a2f21a320a39ddbede95ae3e8114a1b1c56c3524 Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:35:13 -0700 Subject: [PATCH 5/6] override --- vcpkg.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vcpkg.json b/vcpkg.json index 490c99c9c1..09053c14f8 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -22,5 +22,11 @@ "name": "wil", "platform": "windows" } + ], + "overrides": [ + { + "name": "opentelemetry-cpp", + "version": "1.0.3" + } ] } From 1f91994198f0d7cea0a42348461f910ca0aa0bb4 Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:39:37 -0700 Subject: [PATCH 6/6] 1.4.1` --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 09053c14f8..a76a3ffd38 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -26,7 +26,7 @@ "overrides": [ { "name": "opentelemetry-cpp", - "version": "1.0.3" + "version": "1.4.1" } ] }