From 397ae78b1e33e3dada492084516d1178e0c628e7 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Fri, 17 Oct 2025 14:51:11 -0700 Subject: [PATCH] Delete cgmanifest.json when being installed via vcpkg, but also update SHAs (#6789) * Delete cgmanifest.json when being installed via vcpkg, but also update SHAs * Update cspell --------- Co-authored-by: Anton Kolesnyk --- .vscode/cspell.json | 1 + .../azure-data-appconfiguration/vcpkg/portfile.cmake | 3 +++ sdk/attestation/azure-security-attestation/cgmanifest.json | 2 +- .../azure-security-attestation/vcpkg/portfile.cmake | 3 +++ sdk/core/azure-core-amqp/vcpkg/portfile.cmake | 3 +++ .../azure-core-tracing-opentelemetry/vcpkg/portfile.cmake | 3 +++ sdk/core/azure-core/cgmanifest.json | 4 ++-- sdk/core/azure-core/vcpkg/portfile.cmake | 3 +++ .../vcpkg/portfile.cmake | 3 +++ sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake | 3 +++ sdk/identity/azure-identity/vcpkg/portfile.cmake | 3 +++ .../vcpkg/portfile.cmake | 3 +++ .../azure-security-keyvault-certificates/vcpkg/portfile.cmake | 3 +++ .../azure-security-keyvault-keys/vcpkg/portfile.cmake | 3 +++ .../azure-security-keyvault-secrets/vcpkg/portfile.cmake | 3 +++ sdk/storage/azure-storage-blobs/cgmanifest.json | 2 +- sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake | 3 +++ sdk/storage/azure-storage-common/cgmanifest.json | 2 +- sdk/storage/azure-storage-common/vcpkg/portfile.cmake | 3 +++ sdk/storage/azure-storage-files-datalake/cgmanifest.json | 2 +- sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake | 3 +++ sdk/storage/azure-storage-files-shares/cgmanifest.json | 2 +- sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake | 3 +++ sdk/storage/azure-storage-queues/cgmanifest.json | 2 +- sdk/storage/azure-storage-queues/vcpkg/portfile.cmake | 3 +++ sdk/tables/azure-data-tables/vcpkg/portfile.cmake | 3 +++ sdk/template/azure-template/vcpkg/portfile.cmake | 3 +++ 27 files changed, 66 insertions(+), 8 deletions(-) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index acc325a46..843f91b8a 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -94,6 +94,7 @@ "centralindia", "centralus", "centraluseuap", + "cgmanifest", "Chelnokov", "chewi", "Chukwu", diff --git a/sdk/appconfiguration/azure-data-appconfiguration/vcpkg/portfile.cmake b/sdk/appconfiguration/azure-data-appconfiguration/vcpkg/portfile.cmake index 089b156e5..31d14bf27 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/vcpkg/portfile.cmake +++ b/sdk/appconfiguration/azure-data-appconfiguration/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/appconfiguration/azure-data-appconfiguration") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/appconfiguration/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/attestation/azure-security-attestation/cgmanifest.json b/sdk/attestation/azure-security-attestation/cgmanifest.json index 8869ed396..8bce12cbf 100644 --- a/sdk/attestation/azure-security-attestation/cgmanifest.json +++ b/sdk/attestation/azure-security-attestation/cgmanifest.json @@ -6,7 +6,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/openssl/openssl", - "CommitHash": "d82e959e621a3d597f1e0d50ff8c2d8b96915fd7" + "CommitHash": "0893a62353583343eb712adef6debdfbe597c227" } }, "DevelopmentDependency": false diff --git a/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake b/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake index 3fb562431..8c5930a45 100644 --- a/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake +++ b/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/attestation/azure-security-attestation") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/attestation/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/core/azure-core-amqp/vcpkg/portfile.cmake b/sdk/core/azure-core-amqp/vcpkg/portfile.cmake index c5e7d70fc..36d5e0a5b 100644 --- a/sdk/core/azure-core-amqp/vcpkg/portfile.cmake +++ b/sdk/core/azure-core-amqp/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake index 2c21cf7a3..602abfaf4 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake +++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/core/azure-core/cgmanifest.json b/sdk/core/azure-core/cgmanifest.json index ea1609d0b..21b5d63ec 100644 --- a/sdk/core/azure-core/cgmanifest.json +++ b/sdk/core/azure-core/cgmanifest.json @@ -6,7 +6,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/openssl/openssl", - "CommitHash": "d82e959e621a3d597f1e0d50ff8c2d8b96915fd7" + "CommitHash": "0893a62353583343eb712adef6debdfbe597c227" } }, "DevelopmentDependency": false @@ -16,7 +16,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/curl/curl", - "CommitHash": "2cfac302fbeec68f1727cba3d1705e16f02220ad" + "CommitHash": "cfbfb65047e85e6b08af65fe9cdbcf68e9ad496a" } }, "DevelopmentDependency": false diff --git a/sdk/core/azure-core/vcpkg/portfile.cmake b/sdk/core/azure-core/vcpkg/portfile.cmake index b6d771446..d215b0378 100644 --- a/sdk/core/azure-core/vcpkg/portfile.cmake +++ b/sdk/core/azure-core/vcpkg/portfile.cmake @@ -19,6 +19,9 @@ vcpkg_check_features( winhttp BUILD_TRANSPORT_WINHTTP ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake index bbc44d398..d8b32cca2 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake index d7d20e2f5..8048ede74 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake +++ b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/identity/azure-identity/vcpkg/portfile.cmake b/sdk/identity/azure-identity/vcpkg/portfile.cmake index 76684dd10..367a3d297 100644 --- a/sdk/identity/azure-identity/vcpkg/portfile.cmake +++ b/sdk/identity/azure-identity/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/identity/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake index 6251c5669..c32a35356 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake +++ b/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake index 275e37330..fc2a81080 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake +++ b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake index f7174a739..8f36f5149 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake +++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake index 7865e048a..2d4115980 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake +++ b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/storage/azure-storage-blobs/cgmanifest.json b/sdk/storage/azure-storage-blobs/cgmanifest.json index bd0e0ec54..351828120 100644 --- a/sdk/storage/azure-storage-blobs/cgmanifest.json +++ b/sdk/storage/azure-storage-blobs/cgmanifest.json @@ -38,7 +38,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/openssl/openssl", - "CommitHash": "d82e959e621a3d597f1e0d50ff8c2d8b96915fd7" + "CommitHash": "0893a62353583343eb712adef6debdfbe597c227" } }, "DevelopmentDependency": false diff --git a/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake b/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake index fd07e6f4b..69eae5103 100644 --- a/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake +++ b/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/storage/azure-storage-common/cgmanifest.json b/sdk/storage/azure-storage-common/cgmanifest.json index bd0e0ec54..351828120 100644 --- a/sdk/storage/azure-storage-common/cgmanifest.json +++ b/sdk/storage/azure-storage-common/cgmanifest.json @@ -38,7 +38,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/openssl/openssl", - "CommitHash": "d82e959e621a3d597f1e0d50ff8c2d8b96915fd7" + "CommitHash": "0893a62353583343eb712adef6debdfbe597c227" } }, "DevelopmentDependency": false diff --git a/sdk/storage/azure-storage-common/vcpkg/portfile.cmake b/sdk/storage/azure-storage-common/vcpkg/portfile.cmake index 31728a4cf..251f6bf5f 100644 --- a/sdk/storage/azure-storage-common/vcpkg/portfile.cmake +++ b/sdk/storage/azure-storage-common/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/storage/azure-storage-files-datalake/cgmanifest.json b/sdk/storage/azure-storage-files-datalake/cgmanifest.json index bd0e0ec54..351828120 100644 --- a/sdk/storage/azure-storage-files-datalake/cgmanifest.json +++ b/sdk/storage/azure-storage-files-datalake/cgmanifest.json @@ -38,7 +38,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/openssl/openssl", - "CommitHash": "d82e959e621a3d597f1e0d50ff8c2d8b96915fd7" + "CommitHash": "0893a62353583343eb712adef6debdfbe597c227" } }, "DevelopmentDependency": false diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake b/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake index ed4fba3cb..f53256bc8 100644 --- a/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake +++ b/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/storage/azure-storage-files-shares/cgmanifest.json b/sdk/storage/azure-storage-files-shares/cgmanifest.json index bd0e0ec54..351828120 100644 --- a/sdk/storage/azure-storage-files-shares/cgmanifest.json +++ b/sdk/storage/azure-storage-files-shares/cgmanifest.json @@ -38,7 +38,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/openssl/openssl", - "CommitHash": "d82e959e621a3d597f1e0d50ff8c2d8b96915fd7" + "CommitHash": "0893a62353583343eb712adef6debdfbe597c227" } }, "DevelopmentDependency": false diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake b/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake index 1cbc7f9e3..807d05905 100644 --- a/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake +++ b/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/storage/azure-storage-queues/cgmanifest.json b/sdk/storage/azure-storage-queues/cgmanifest.json index bd0e0ec54..351828120 100644 --- a/sdk/storage/azure-storage-queues/cgmanifest.json +++ b/sdk/storage/azure-storage-queues/cgmanifest.json @@ -38,7 +38,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/openssl/openssl", - "CommitHash": "d82e959e621a3d597f1e0d50ff8c2d8b96915fd7" + "CommitHash": "0893a62353583343eb712adef6debdfbe597c227" } }, "DevelopmentDependency": false diff --git a/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake b/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake index a18b8b322..ad78e6575 100644 --- a/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake +++ b/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/tables/azure-data-tables/vcpkg/portfile.cmake b/sdk/tables/azure-data-tables/vcpkg/portfile.cmake index 8282dfd71..7b815b6ff 100644 --- a/sdk/tables/azure-data-tables/vcpkg/portfile.cmake +++ b/sdk/tables/azure-data-tables/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/tables/azure-data-tables") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/tables/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") diff --git a/sdk/template/azure-template/vcpkg/portfile.cmake b/sdk/template/azure-template/vcpkg/portfile.cmake index 4e9fe73ef..9e0b62907 100644 --- a/sdk/template/azure-template/vcpkg/portfile.cmake +++ b/sdk/template/azure-template/vcpkg/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( HEAD_REF main ) +file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json") +file(REMOVE_RECURSE ${unused}) + if(EXISTS "${SOURCE_PATH}/sdk/template/azure-template") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/template/_") file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")