-
Notifications
You must be signed in to change notification settings - Fork 157
Update vcpkg ports to use a manifest json file instead of a CONTROL file. #2132
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.
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
Changes from all commits
775d9d4
bc924fe
945a3c0
06fb12c
d71b639
622ebfd
75b047c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,7 +37,7 @@ param ( | |
| # If there's nothing in the "port" folder to upload set SkipVcpkgUpdate to true | ||
| # and exit. Other steps will check SkipVcpkgUpdate to decide whether to move | ||
| # forward. | ||
| if (!(Get-ChildItem -Path "$SourceDirectory/port/CONTROL")) { | ||
| if (!(Get-ChildItem -Path "$SourceDirectory/port/vcpkg.json")) { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @danieljurek, can you fork off this branch https://github.com/ahsonkhan/azure-sdk-for-cpp/tree/UpdatePorts to make the engsys fixes in the release pipeline, if we need to make any other fixes, and test it with the daily vcpkg test PR. Let me know if you want me to keep this change in as part of this PR, or remove it. |
||
| Write-Host "###vso[task.setvariable variable=SkipVcpkgUpdate]true" | ||
| exit | ||
| } | ||
|
|
||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-core-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should be using version-semver.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What do you mean? This is replaced by our tooling with the version string from version.hpp on release. |
||
| "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", | ||
| "dependencies": [ | ||
| { | ||
| "name": "openssl", | ||
| "platform": "!windows & !uwp" | ||
| } | ||
| ], | ||
| "default-features": [ | ||
| "http" | ||
| ], | ||
| "features": { | ||
| "curl": { | ||
| "description": "Build an HTTP transport implementation with LibCURL", | ||
| "dependencies": [ | ||
| { | ||
| "name": "azure-core-cpp", | ||
| "default-features": false | ||
| }, | ||
| "curl" | ||
| ] | ||
| }, | ||
| "http": { | ||
| "description": "Build all HTTP transport implementations, depending on the platform", | ||
| "dependencies": [ | ||
| { | ||
| "name": "azure-core-cpp", | ||
| "default-features": false, | ||
| "features": [ | ||
| "curl" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "azure-core-cpp", | ||
| "default-features": false, | ||
| "features": [ | ||
| "curl", | ||
| "winhttp" | ||
| ], | ||
| "platform": "windows & !uwp" | ||
| } | ||
| ] | ||
| }, | ||
| "winhttp": { | ||
| "description": "Build an HTTP transport implementation with WinHTTP", | ||
| "dependencies": [ | ||
| { | ||
| "name": "azure-core-cpp", | ||
| "default-features": false | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-identity-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
| "description": [ | ||
| "Microsoft Azure Identity SDK for C++", | ||
| "This library provides common authentication-related abstractions for Azure SDK." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/identity/azure-identity", | ||
| "dependencies": [ | ||
| "azure-core-cpp" | ||
| ] | ||
| } |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
|
Comment on lines
+1
to
+3
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am wondering if we should remove these comment now, since the file is JSON, and JSON doesn't support comments.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there any json-parser which will fail because if this file header?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We remove them with scripts
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Yes, if they ingest it directly. Many RFC-compliant json parsers trip up on this.
Yes. |
||
| { | ||
| "name": "azure-security-keyvault-common-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is now a JSON string, so wrapped in quotes, where previously it was just: |
||
| "description": [ | ||
| "Microsoft Azure Common Key Vault SDK for C++", | ||
| "This library provides common Azure KeyVault-related abstractions for Azure SDK." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-common", | ||
| "dependencies": [ | ||
| "azure-core-cpp" | ||
| ] | ||
| } | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-security-keyvault-keys-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
| "description": [ | ||
| "Microsoft Azure Key Vault Keys SDK for C++", | ||
| "This library provides Azure Key Vault Keys SDK." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-keys", | ||
| "dependencies": [ | ||
| "azure-security-keyvault-common-cpp" | ||
| ] | ||
| } |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-storage-blobs-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
| "description": [ | ||
| "Microsoft Azure Storage Blobs SDK for C++", | ||
| "This library provides Azure Storage Blobs SDK." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs", | ||
| "dependencies": [ | ||
| "azure-storage-common-cpp" | ||
| ] | ||
| } |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-storage-common-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
| "description": [ | ||
| "Microsoft Azure Common Storage SDK for C++", | ||
| "This library provides common Azure Storage-related abstractions for Azure SDK." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common", | ||
| "dependencies": [ | ||
| "azure-core-cpp", | ||
| "libxml2", | ||
| { | ||
| "name": "openssl", | ||
| "platform": "!windows" | ||
| } | ||
| ] | ||
| } |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-storage-files-datalake-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
| "description": [ | ||
| "Microsoft Azure Storage Files Data Lake SDK for C++", | ||
| "This library provides Azure Storage Files Data Lake SDK." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake", | ||
| "dependencies": [ | ||
| "azure-storage-blobs-cpp" | ||
| ] | ||
| } |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-storage-files-shares-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
| "description": [ | ||
| "Microsoft Azure Storage Files Shares SDK for C++", | ||
| "This library provides Azure Storage Files Shares SDK." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-shares", | ||
| "dependencies": [ | ||
| "azure-storage-common-cpp" | ||
| ] | ||
| } |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| { | ||
| "name": "azure-template-cpp", | ||
| "version-string": "@AZ_LIBRARY_VERSION@", | ||
| "description": [ | ||
| "Microsoft Azure Template SDK for C++", | ||
| "This is a template library meant to illustrate initial client library development process for Azure SDK.", | ||
| "It is not meant to be published to vcpkg." | ||
| ], | ||
| "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/template/azure-template", | ||
| "dependencies": [ | ||
| "azure-core-cpp" | ||
| ] | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@antkmsft I don't think this holds true anymore, since we are not using a
CONTROLfile.