Skip to content

Update vcpkg SHA to match the C++ repo #2869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antkmsft merged 2 commits into from
Jul 12, 2024
Merged

Update vcpkg SHA to match the C++ repo #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c26774
Update vcpkg SHA to match the C++ repo
antkmsft Jul 12, 2024
8a6a5cf
sizeof('x') is 1 in C++, but in C, it is 4 (to be pedantic, it is not…
antkmsft Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake-modules/AzureVcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ macro(az_vcpkg_integrate)
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 8150939b69720adc475461978e07c2d2bf5fb76e) # default SDK tested commit
set(VCPKG_COMMIT_STRING 5312e9f976e89b256954f571433e34f783dd2d12) # default SDK tested commit
if(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
Expand Down
2 changes: 1 addition & 1 deletion eng/vcpkg-commit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8150939b69720adc475461978e07c2d2bf5fb76e
5312e9f976e89b256954f571433e34f783dd2d12
4 changes: 2 additions & 2 deletions sdk/samples/iot/iot_sample_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ void iot_sample_create_mqtt_endpoint(
{
int32_t const required_size = az_span_size(mqtt_url_prefix)
+ az_span_size(env_vars->hub_hostname) + az_span_size(mqtt_url_suffix)
+ (int32_t)sizeof('\0');
+ (int32_t)sizeof((uint8_t)'\0');

if ((size_t)required_size > endpoint_size)
{
Expand All @@ -351,7 +351,7 @@ void iot_sample_create_mqtt_endpoint(
else if (type == PAHO_IOT_PROVISIONING)
{
int32_t const required_size
= az_span_size(provisioning_global_endpoint) + (int32_t)sizeof('\0');
= az_span_size(provisioning_global_endpoint) + (int32_t)sizeof((uint8_t)'\0');

if ((size_t)required_size > endpoint_size)
{
Expand Down
4 changes: 2 additions & 2 deletions sdk/src/azure/core/az_http_policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ AZ_NODISCARD az_result az_http_pipeline_policy_apiversion(
#define _az_TELEMETRY_ID_PREFIX_LENGTH (sizeof(_az_TELEMETRY_ID_PREFIX) - 1)
#define _az_TELEMETRY_COMPONENT_NAME_MAX_LENGTH 40
#define _az_TELEMETRY_VERSION_MAX_LENGTH (sizeof("12.345.6789-preview.123") - 1)
#define _az_TELEMETRY_ID_MAX_LENGTH \
(_az_TELEMETRY_ID_PREFIX_LENGTH + _az_TELEMETRY_COMPONENT_NAME_MAX_LENGTH + sizeof('/') \
#define _az_TELEMETRY_ID_MAX_LENGTH \
(_az_TELEMETRY_ID_PREFIX_LENGTH + _az_TELEMETRY_COMPONENT_NAME_MAX_LENGTH + sizeof((uint8_t)'/') \
+ _az_TELEMETRY_VERSION_MAX_LENGTH)

AZ_NODISCARD az_result az_http_pipeline_policy_telemetry(
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "azure-sdk-for-c",
"version": "1.0.0",
"builtin-baseline": "8150939b69720adc475461978e07c2d2bf5fb76e",
"builtin-baseline": "5312e9f976e89b256954f571433e34f783dd2d12",
"dependencies": [
{
"name": "curl"
Expand Down
⚡