Skip to content

[azure-core-cpp] Update to 1.1.0 #18779

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
ras0219-msft merged 8 commits into from
Jul 8, 2021
Merged

[azure-core-cpp] Update to 1.1.0 #18779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0863a7b
[azure-core-cpp] Update to 1.1.0
azure-sdk Jul 2, 2021
818b315
[azure-storage-common-cpp] Update to 12.0.1
azure-sdk Jul 7, 2021
a54433a
[azure-storage-blobs-cpp] Update to 12.0.1
azure-sdk Jul 7, 2021
a39b182
[azure-storage-files-datalake-cpp] Update to 12.0.1
azure-sdk Jul 7, 2021
f74c492
[azure-storage-files-shares-cpp] Update to 12.0.1
azure-sdk Jul 7, 2021
92ac646
Remove curl version from vcpkg manifest
antkmsft Jul 7, 2021
ecf274e
Merge branch 'azure-sdk-for-cpp-jul-2021' of https://github.com/azure…
antkmsft Jul 7, 2021
ca10352
Update version files
antkmsft Jul 7, 2021
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
4 changes: 2 additions & 2 deletions ports/azure-core-cpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-sdk-for-cpp
REF azure-core_1.0.0
SHA512 84b1f56103677166b0bff1aa4837fed950545a4851e260f3aaf304d797d7fb270b5dc52d373fcb73de0c3e6a9366d860ff4f4d90eae9ba3f8e2ffe4eb211e3f2
REF azure-core_1.1.0
SHA512 83d8ba283179531fbd5b1e81b468b5fdb1d3aa846b2b9edd579a4e56a44f412986ad3558c98009a274e8c8fda301a5a434caf62dd990e3d9e8b07993d5218520
)

vcpkg_check_features(
Expand Down
8 changes: 5 additions & 3 deletions ports/azure-core-cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "azure-core-cpp",
"version-semver": "1.0.0",
"version-semver": "1.1.0",
"description": [
"Microsoft Azure Core SDK for C++",
"This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "openssl",
Expand Down Expand Up @@ -37,7 +38,8 @@
"default-features": false,
"features": [
"ssl"
]
],
"version>=": "7.44"

@ras0219-msft ras0219-msft Jul 6, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This version constraint will fail if users are using the curated catalog, because there is no entry for 7.44 in the curl version database: https://github.com/microsoft/vcpkg/blob/master/versions/c-/curl.json

Suggested change
],
"version>=": "7.44"
]

@ahsonkhan ahsonkhan Jul 6, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it feasible for us to add a version entry for a few of the older versions down to 7.44, to the curl version database?

I am curious to understand the rationale why it went down to 7.48 only:
#15652

FYI @antkmsft, we'd want to make a similar change in https://github.com/Azure/azure-sdk-for-cpp/blob/a8d7a48a07a1eed8cc60dc00a7f618b6282c5eb7/sdk/core/azure-core/vcpkg/vcpkg.json#L44-L46

@ras0219-msft ras0219-msft Jul 6, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As policy, we don't backfill older versions into the public catalog because there's no reasonable way for us to test them (and ensure they're fit for use). Since 7.48.0 is the oldest version available in the public catalog, the two reasonable approaches are:

  1. Don't specify a constraint -- all users will have 7.48 or newer if they're using the curated catalog and if a user is trying to use a custom older version they'll just use overrides anyway to force that version
  2. Specify a constraint on the oldest version with a compatible version scheme in the curated catalog (7.74.0#5).

I strongly recommend option 1.

@antkmsft antkmsft Jul 6, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahsonkhan, I'd do the following: apply this PR suggestion, and make a similar PR removing the very same line from vcpkg.json in our repo. No other work is necessary. I am glad it is known to us now, so we don't have to make a port-version: 1 commit to vcpkg repo removing the version.

@antkmsft antkmsft Jul 6, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot to add, after we commit the version removal, we'll need to run vcpkg x-add-version --overwrite-version azure-core-cpp and do a subsequent commit to this vcpkg repo PR. No other actions are needed (we don't have to run the equivalent of ``vcpkg x-add-version` for the commit to our repo).

@antkmsft antkmsft Jul 7, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made the updates I talked above

@ahsonkhan ahsonkhan Jul 7, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix @antkmsft - @ras0219 please let us know if it looks good now. Thanks!

}
]
},
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-core-cpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c560c27be10456cb0239543073f28595094ed6ee",
"version-semver": "1.1.0",
"port-version": 0
},
{
"git-tree": "15d579e95b536829e42fc2fda4c8b6365180eb3a",
"version-semver": "1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
"port-version": 1
},
"azure-core-cpp": {
"baseline": "1.0.0",
"baseline": "1.1.0",
"port-version": 0
},
"azure-identity-cpp": {
Expand Down