Skip to content

Bump github.com/microsoft/vcpkg from master to ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0 #6659

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
merged 23 commits into from
Sep 5, 2025
+65 −14
Merged

Bump github.com/microsoft/vcpkg from master to ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0 #6659

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4e916df
Bump github.com/microsoft/vcpkg
dependabot[bot] Jul 18, 2025
fa1736e
Update vcpkg.json
RickWinter Jul 18, 2025
9010bcf
Update default VCPKG commit hash in AzureVcpkg.cmake
antkmsft Sep 3, 2025
37772b7
Merge remote-tracking branch 'upstream/main' into dependabot/vcpkg/gi…
antkmsft Sep 3, 2025
fd27180
try fixing CI by updating xcode version
antkmsft Sep 3, 2025
35b85d8
16.2 -> 16.4
antkmsft Sep 3, 2025
21200ae
Fix the reason for overfow warning
antkmsft Sep 3, 2025
7a2a1e5
Suppress warning C6326: Potential comparison of a constant with anoth…
antkmsft Sep 3, 2025
00fc6e0
Undo unintended format
antkmsft Sep 3, 2025
e266053
Correct condition to check whether it is possible to add epoch to sys…
antkmsft Sep 3, 2025
499a129
Insert info for debugging on mac
antkmsft Sep 4, 2025
a671c67
Better temp log formatting
antkmsft Sep 4, 2025
7e404b9
Use largest int type for calcuations (mac fix)
antkmsft Sep 4, 2025
e465704
In case system clock is lesser resolution than Azure::DateTime, do al…
antkmsft Sep 4, 2025
1e015b3
Avoid overflowing system clock max when converting to time since epoch
antkmsft Sep 4, 2025
ba90864
Add one more variable for debug logging on mac
antkmsft Sep 4, 2025
1c9b0ce
Avoid one more integer overflow
antkmsft Sep 5, 2025
0944dcf
Remove debug stuff
antkmsft Sep 5, 2025
b6fcd7f
CLang-format
antkmsft Sep 5, 2025
43521fb
More clang-format
antkmsft Sep 5, 2025
6259422
Less conversions if equal
antkmsft Sep 5, 2025
29364a6
Commit to reset CI
antkmsft Sep 5, 2025
40a9772
Undo commit to reset CI
antkmsft Sep 5, 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 2c7705e70dcfb70e5f726459c3e399bd780bc1fc) # default SDK tested commit
set(VCPKG_COMMIT_STRING ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0) # 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/stages/platform-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"OSConfiguration": {
"macos-latest": {
"OSVmImage": "env:MACVMIMAGE",
"XCODE_VERSION": "15.4"
"XCODE_VERSION": "16.4"
}
},
"StaticConfigs": {
Expand Down
12 changes: 11 additions & 1 deletion sdk/core/azure-core/src/datetime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ DateTime GetSystemClockEpoch()

DateTime GetMaxDateTime()
{
#ifdef _MSC_VER
#pragma warning(push)
// warning C6326: Potential comparison of a constant with another constant.
#pragma warning(disable : 6326)
#endif
auto const systemClockMax = std::chrono::duration_cast<DateTime::clock::duration>(
(std::chrono::system_clock::time_point::max)().time_since_epoch())
.count();
Expand All @@ -52,7 +57,12 @@ DateTime GetMaxDateTime()
constexpr auto repMax = (std::numeric_limits<DateTime::clock::duration::rep>::max)();

return DateTime(DateTime::time_point(DateTime::duration(
systemClockMax + (std::min)(systemClockEpoch, (repMax - systemClockMax)))));
(systemClockMax < repMax && (repMax - systemClockEpoch) < (repMax - systemClockMax))
? (systemClockMax + systemClockEpoch)
: systemClockMax)));
#ifdef _MSC_VER
#pragma warning(pop)
#endif
}

template <typename T>
Expand Down
9 changes: 5 additions & 4 deletions 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": "2c7705e70dcfb70e5f726459c3e399bd780bc1fc",
"builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
"dependencies": [
{
"name": "curl"
Expand All @@ -16,7 +16,9 @@
},
{
"name": "opentelemetry-cpp",
"features": ["otlp-http"],
"features": [
"otlp-http"
],
"platform": "!(windows & !static)",
"version>=": "1.3.0"
},
Expand All @@ -37,6 +39,5 @@
"platform": "!uwp"
}
],
"overrides": [
]
"overrides": []
}
Loading