Skip to content

Update vcpkg baseline #6574

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 14 commits into from
May 21, 2025
Merged

Update vcpkg baseline #6574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fe9e981
Update vcpkg baseline
antkmsft May 15, 2025
c7e5150
Make code to compile with either newer or older version of openteleme…
antkmsft May 15, 2025
a9b2b2a
Clang-format
antkmsft May 15, 2025
8af7ad3
Suppress otel warnings in stress test code
antkmsft May 15, 2025
ac508fc
Update CI to update vcpkg cache if the run is PR-initiated
antkmsft May 16, 2025
c4103a5
Turn SSL caching off by default
antkmsft May 17, 2025
271bb10
Make code to compile with either newer or older version of openteleme…
antkmsft May 15, 2025
b548f2f
Clang-format
antkmsft May 15, 2025
f83f288
Integrate the exact copy of #6581 - to make sure we're testing the sa…
antkmsft May 17, 2025
7ba214c
Update cspell
antkmsft May 17, 2025
9eea1d9
Move feature to bugfix
antkmsft May 17, 2025
a943c64
Update vcpkg.yml
antkmsft May 19, 2025
ad5e3ed
Copy #6582 to verify against the latest libcurl
antkmsft May 20, 2025
4818de3
Undo unnecessary changes
antkmsft May 21, 2025
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 @@ -18,7 +18,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 f0f811770e0538fcb295a1750c0a5e0de5131d29) # default SDK tested commit
set(VCPKG_COMMIT_STRING 2c7705e70dcfb70e5f726459c3e399bd780bc1fc) # 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/pipelines/templates/steps/vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
)
displayName: vcpkg --version

- ${{if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
Comment thread
antkmsft marked this conversation as resolved.
- ${{if eq(variables['System.TeamProject'], 'internal') }}:
- task: AzurePowerShell@5
displayName: Set Vcpkg Write-mode Cache
inputs:
Expand Down
2 changes: 2 additions & 0 deletions sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,8 @@ class TestExporter final : public opentelemetry::sdk::trace::SpanExporter {
*/
bool Shutdown(std::chrono::microseconds) noexcept override { return true; }

bool ForceFlush(std::chrono::microseconds) noexcept override { return true; }
Comment thread
antkmsft marked this conversation as resolved.

private:
std::shared_ptr<TestData> m_testData;
};
1 change: 1 addition & 0 deletions ...nthubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/eventhubs_stress_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#pragma warning(push)
#pragma warning(disable : 4100)
#pragma warning(disable : 4244)
#pragma warning(disable : 4996)
Comment thread
antkmsft marked this conversation as resolved.
#pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning.
#endif

Expand Down
1 change: 1 addition & 0 deletions ...e-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/batch_stress_tests.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#pragma warning(push)
#pragma warning(disable : 4100)
#pragma warning(disable : 4244)
#pragma warning(disable : 4996)
#pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning.
#endif

Expand Down
1 change: 1 addition & 0 deletions ...ure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#pragma warning(push)
#pragma warning(disable : 4100)
#pragma warning(disable : 4244)
#pragma warning(disable : 4996)
#pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning.
#endif

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-cpp",
"version": "1.5.0",
"builtin-baseline": "f0f811770e0538fcb295a1750c0a5e0de5131d29",
"builtin-baseline": "2c7705e70dcfb70e5f726459c3e399bd780bc1fc",
"dependencies": [
{
"name": "curl"
Expand Down
Loading
⚡