From 0c5c1aee46433b9918d659a0cf0a505ecae8f453 Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Mon, 7 Nov 2022 17:16:19 -0500 Subject: [PATCH 1/8] Update vcpkg baseline to the October 2022 tag. --- eng/vcpkg-commit.txt | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/vcpkg-commit.txt b/eng/vcpkg-commit.txt index a2ca93e30d..8f79f85431 100644 --- a/eng/vcpkg-commit.txt +++ b/eng/vcpkg-commit.txt @@ -1 +1 @@ -tags/2020.06 +tags/2022.10.19 diff --git a/vcpkg.json b/vcpkg.json index c4bd1cf042..9418fb008b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-c", "version": "1.0.0", - "builtin-baseline": "f0aa678b7471497f1adedcc99f40e1599ad22f69", + "builtin-baseline": "94ce0dab56f4d8ba6bd631ba59ed682b02d45c46", "dependencies": [ { "name": "curl" From 50c6c250d49fe516663cb91c067f5f6ac9a542e3 Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Mon, 7 Nov 2022 17:20:13 -0500 Subject: [PATCH 2/8] Update cmake module to use the new commit sha. --- 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 076ef40dc8..f51ef08795 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -21,7 +21,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 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46) # 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 1c036fcf65a6a18a0b8f1af0dac94f505b329a37 Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Mon, 7 Nov 2022 17:39:32 -0500 Subject: [PATCH 3/8] Update IoT samples to include the correct MQTTClient header file. --- sdk/samples/iot/paho_iot_hub_c2d_sample.c | 2 +- sdk/samples/iot/paho_iot_hub_methods_sample.c | 2 +- sdk/samples/iot/paho_iot_hub_sas_telemetry_sample.c | 2 +- sdk/samples/iot/paho_iot_hub_telemetry_sample.c | 2 +- sdk/samples/iot/paho_iot_hub_twin_sample.c | 2 +- sdk/samples/iot/paho_iot_pnp_sample.c | 2 +- sdk/samples/iot/paho_iot_pnp_sample_common.c | 2 +- sdk/samples/iot/paho_iot_pnp_with_provisioning_sample.c | 2 +- sdk/samples/iot/paho_iot_provisioning_sample.c | 2 +- sdk/samples/iot/paho_iot_provisioning_sas_sample.c | 2 +- sdk/samples/iot/pnp/pnp_mqtt_message.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/samples/iot/paho_iot_hub_c2d_sample.c b/sdk/samples/iot/paho_iot_hub_c2d_sample.c index 04546a058e..02f1443a56 100644 --- a/sdk/samples/iot/paho_iot_hub_c2d_sample.c +++ b/sdk/samples/iot/paho_iot_hub_c2d_sample.c @@ -12,7 +12,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_hub_methods_sample.c b/sdk/samples/iot/paho_iot_hub_methods_sample.c index 65a142cff0..96c21be8d7 100644 --- a/sdk/samples/iot/paho_iot_hub_methods_sample.c +++ b/sdk/samples/iot/paho_iot_hub_methods_sample.c @@ -12,7 +12,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_hub_sas_telemetry_sample.c b/sdk/samples/iot/paho_iot_hub_sas_telemetry_sample.c index 8c7693d6a4..16ba0cff81 100644 --- a/sdk/samples/iot/paho_iot_hub_sas_telemetry_sample.c +++ b/sdk/samples/iot/paho_iot_hub_sas_telemetry_sample.c @@ -12,7 +12,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_hub_telemetry_sample.c b/sdk/samples/iot/paho_iot_hub_telemetry_sample.c index 715011366e..4ee44f0f73 100644 --- a/sdk/samples/iot/paho_iot_hub_telemetry_sample.c +++ b/sdk/samples/iot/paho_iot_hub_telemetry_sample.c @@ -12,7 +12,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_hub_twin_sample.c b/sdk/samples/iot/paho_iot_hub_twin_sample.c index aa689e85e3..8b1f4e3683 100644 --- a/sdk/samples/iot/paho_iot_hub_twin_sample.c +++ b/sdk/samples/iot/paho_iot_hub_twin_sample.c @@ -12,7 +12,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_pnp_sample.c b/sdk/samples/iot/paho_iot_pnp_sample.c index 5c32744aee..7664766417 100644 --- a/sdk/samples/iot/paho_iot_pnp_sample.c +++ b/sdk/samples/iot/paho_iot_pnp_sample.c @@ -24,7 +24,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_pnp_sample_common.c b/sdk/samples/iot/paho_iot_pnp_sample_common.c index bce39332fb..8a96947a49 100644 --- a/sdk/samples/iot/paho_iot_pnp_sample_common.c +++ b/sdk/samples/iot/paho_iot_pnp_sample_common.c @@ -30,7 +30,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_pnp_with_provisioning_sample.c b/sdk/samples/iot/paho_iot_pnp_with_provisioning_sample.c index 12a031200e..a34e1ee725 100644 --- a/sdk/samples/iot/paho_iot_pnp_with_provisioning_sample.c +++ b/sdk/samples/iot/paho_iot_pnp_with_provisioning_sample.c @@ -23,7 +23,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_provisioning_sample.c b/sdk/samples/iot/paho_iot_provisioning_sample.c index 9df1020f57..3c06622c16 100644 --- a/sdk/samples/iot/paho_iot_provisioning_sample.c +++ b/sdk/samples/iot/paho_iot_provisioning_sample.c @@ -12,7 +12,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/paho_iot_provisioning_sas_sample.c b/sdk/samples/iot/paho_iot_provisioning_sas_sample.c index 86717a6b3d..d3b1f40b2a 100644 --- a/sdk/samples/iot/paho_iot_provisioning_sas_sample.c +++ b/sdk/samples/iot/paho_iot_provisioning_sas_sample.c @@ -12,7 +12,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/samples/iot/pnp/pnp_mqtt_message.h b/sdk/samples/iot/pnp/pnp_mqtt_message.h index e6ee6b298a..8461d28e33 100644 --- a/sdk/samples/iot/pnp/pnp_mqtt_message.h +++ b/sdk/samples/iot/pnp/pnp_mqtt_message.h @@ -13,7 +13,7 @@ // warning C4201: nonstandard extension used: nameless struct/union #pragma warning(disable : 4201) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif From d88917e87634820970280537508ba95c65a1caae Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Mon, 7 Nov 2022 17:42:20 -0500 Subject: [PATCH 4/8] Remove the overrides as it should not be necessary with the latest baseline. --- vcpkg.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 9418fb008b..5bc05174b0 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -12,11 +12,5 @@ { "name": "cmocka" } - ], - "overrides": [ - { - "name": "zlib", - "version": "1.2.12#2" - } ] } From 360a47fbda8ab63ab95cbaa45ce0632d64eb5f2f Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Tue, 8 Nov 2022 17:08:21 -0500 Subject: [PATCH 5/8] Add debugging messages to powershell script and cmake module. --- cmake-modules/AzureVcpkg.cmake | 8 ++++++++ eng/scripts/vcpkg.ps1 | 2 ++ 2 files changed, 10 insertions(+) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index f51ef08795..7323822b3f 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -4,27 +4,35 @@ # Defines utilities for Azure SDK to integrate with VCPKG automatically macro(az_vcpkg_integrate) + message("Vcpkg integrate") # AUTO CMAKE_TOOLCHAIN_FILE: # User can call `cmake -DCMAKE_TOOLCHAIN_FILE="path_to_the_toolchain"` as the most specific scenario. # An env var VCPKG_ROOT or VCPKG_INSTALLATION_ROOT can be set to let Azure SDK to set the VCPKG toolchain automatically. # As the last alternative (default case), Azure SDK will automatically clone VCPKG folder and set toolchain from there. if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) + message("NOT DEFINED CMAKE_TOOLCHAIN_FILE") if(DEFINED ENV{VCPKG_ROOT}) + message("DEFINED ENV{VCPKG_ROOT}") set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") elseif(DEFINED ENV{VCPKG_INSTALLATION_ROOT}) + message("DEFINED ENV{VCPKG_INSTALLATION_ROOT}") set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") else() + message("else") # Set AZURE_SDK_DISABLE_AUTO_VCPKG env var to avoid Azure SDK from cloning and setting VCPKG automatically # This option delegate package's dependencies installation to user. if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG}) + message("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 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) + message("NOT DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit endif() + message("Commit string: ${VCPKG_COMMIT_STRING}") include(FetchContent) FetchContent_Declare( vcpkg diff --git a/eng/scripts/vcpkg.ps1 b/eng/scripts/vcpkg.ps1 index 0bf654a62a..b4acc9cfa7 100644 --- a/eng/scripts/vcpkg.ps1 +++ b/eng/scripts/vcpkg.ps1 @@ -16,9 +16,11 @@ Param ( $initialDirectory = Get-Location try { + Write-Host "Cloning into: $VcpkgPath" git clone https://github.com/Microsoft/vcpkg $VcpkgPath Set-Location $VcpkgPath git fetch --tags + Write-Host "Checking-out: $Ref" git checkout $Ref if ($IsWindows) { From 2b855272e0c97a4913832b4569e92005c3562df7 Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Tue, 8 Nov 2022 17:39:15 -0500 Subject: [PATCH 6/8] Print out the vcpkg root and installation root env var values. --- cmake-modules/AzureVcpkg.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 7323822b3f..0674196877 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -13,10 +13,15 @@ macro(az_vcpkg_integrate) message("NOT DEFINED CMAKE_TOOLCHAIN_FILE") if(DEFINED ENV{VCPKG_ROOT}) message("DEFINED ENV{VCPKG_ROOT}") + message("String value: ${VCPKG_ROOT}") + message("String value: $ENV{VCPKG_ROOT}") set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") elseif(DEFINED ENV{VCPKG_INSTALLATION_ROOT}) message("DEFINED ENV{VCPKG_INSTALLATION_ROOT}") + message("String value: ${VCPKG_INSTALLATION_ROOT}") + message("String value: $ENV{VCPKG_INSTALLATION_ROOT}") + set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") else() From e9a667ab3199a14daf40cfa01096e0d43a78b0af Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Tue, 8 Nov 2022 18:39:08 -0500 Subject: [PATCH 7/8] Remove the use of VCPKG_ROOT and VCPKG_INSTALLATION_ROOT from the cmake module. --- cmake-modules/AzureVcpkg.cmake | 65 +++++++++++++--------------------- 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 0674196877..e129b157af 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -7,51 +7,34 @@ macro(az_vcpkg_integrate) message("Vcpkg integrate") # AUTO CMAKE_TOOLCHAIN_FILE: # User can call `cmake -DCMAKE_TOOLCHAIN_FILE="path_to_the_toolchain"` as the most specific scenario. - # An env var VCPKG_ROOT or VCPKG_INSTALLATION_ROOT can be set to let Azure SDK to set the VCPKG toolchain automatically. # As the last alternative (default case), Azure SDK will automatically clone VCPKG folder and set toolchain from there. if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) message("NOT DEFINED CMAKE_TOOLCHAIN_FILE") - if(DEFINED ENV{VCPKG_ROOT}) - message("DEFINED ENV{VCPKG_ROOT}") - message("String value: ${VCPKG_ROOT}") - message("String value: $ENV{VCPKG_ROOT}") - set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "") - elseif(DEFINED ENV{VCPKG_INSTALLATION_ROOT}) - message("DEFINED ENV{VCPKG_INSTALLATION_ROOT}") - message("String value: ${VCPKG_INSTALLATION_ROOT}") - message("String value: $ENV{VCPKG_INSTALLATION_ROOT}") - - set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "") - else() - message("else") - # Set AZURE_SDK_DISABLE_AUTO_VCPKG env var to avoid Azure SDK from cloning and setting VCPKG automatically - # This option delegate package's dependencies installation to user. - if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG}) - message("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 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46) # default SDK tested commit - if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) - message("NOT DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}") - set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit - endif() - message("Commit string: ${VCPKG_COMMIT_STRING}") - include(FetchContent) - FetchContent_Declare( - vcpkg - GIT_REPOSITORY https://github.com/microsoft/vcpkg.git - GIT_TAG ${VCPKG_COMMIT_STRING} - ) - FetchContent_GetProperties(vcpkg) - # make sure to pull vcpkg only once. - if(NOT vcpkg_POPULATED) - FetchContent_Populate(vcpkg) - endif() - # use the vcpkg source path - set(CMAKE_TOOLCHAIN_FILE "${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") + # Set AZURE_SDK_DISABLE_AUTO_VCPKG env var to avoid Azure SDK from cloning and setting VCPKG automatically + # This option delegate package's dependencies installation to user. + if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG}) + message("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 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46) # default SDK tested commit + if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) + message("NOT DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}") + set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit + endif() + message("Commit string: ${VCPKG_COMMIT_STRING}") + include(FetchContent) + FetchContent_Declare( + vcpkg + GIT_REPOSITORY https://github.com/microsoft/vcpkg.git + GIT_TAG ${VCPKG_COMMIT_STRING} + ) + FetchContent_GetProperties(vcpkg) + # make sure to pull vcpkg only once. + if(NOT vcpkg_POPULATED) + FetchContent_Populate(vcpkg) endif() + # use the vcpkg source path + set(CMAKE_TOOLCHAIN_FILE "${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") endif() endif() From 895a97d47a147d044aefdd533e910781b93dd9a6 Mon Sep 17 00:00:00 2001 From: ahsonkhan Date: Tue, 8 Nov 2022 19:05:00 -0500 Subject: [PATCH 8/8] Update debug messages and revert changes to vcpkg.ps1 since it isn't used anywhere. --- cmake-modules/AzureVcpkg.cmake | 10 +++++----- eng/scripts/vcpkg.ps1 | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index e129b157af..2a888c621f 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -4,24 +4,24 @@ # Defines utilities for Azure SDK to integrate with VCPKG automatically macro(az_vcpkg_integrate) - message("Vcpkg integrate") + message("Vcpkg integrate step.") # AUTO CMAKE_TOOLCHAIN_FILE: # User can call `cmake -DCMAKE_TOOLCHAIN_FILE="path_to_the_toolchain"` as the most specific scenario. # As the last alternative (default case), Azure SDK will automatically clone VCPKG folder and set toolchain from there. if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) - message("NOT DEFINED CMAKE_TOOLCHAIN_FILE") + message("CMAKE_TOOLCHAIN_FILE is not defined. Define it for the user.") # Set AZURE_SDK_DISABLE_AUTO_VCPKG env var to avoid Azure SDK from cloning and setting VCPKG automatically # This option delegate package's dependencies installation to user. if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG}) - message("NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG}") + message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of 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 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) - message("NOT DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}") + message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit endif() - message("Commit string: ${VCPKG_COMMIT_STRING}") + message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}") include(FetchContent) FetchContent_Declare( vcpkg diff --git a/eng/scripts/vcpkg.ps1 b/eng/scripts/vcpkg.ps1 index b4acc9cfa7..0bf654a62a 100644 --- a/eng/scripts/vcpkg.ps1 +++ b/eng/scripts/vcpkg.ps1 @@ -16,11 +16,9 @@ Param ( $initialDirectory = Get-Location try { - Write-Host "Cloning into: $VcpkgPath" git clone https://github.com/Microsoft/vcpkg $VcpkgPath Set-Location $VcpkgPath git fetch --tags - Write-Host "Checking-out: $Ref" git checkout $Ref if ($IsWindows) {