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 <antkmsft@users.noreply.github.com>
2025-10-17 14:51:11 -07:00 · 2025-10-17 14:51:11 -07:00 · 397ae78b1e
commit 397ae78b1e
parent f0b5bfd684
27 changed files with 66 additions and 8 deletions
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@ -94,6 +94,7 @@
    "centralindia",
    "centralus",
    "centraluseuap",
+    "cgmanifest",
    "Chelnokov",
    "chewi",
    "Chukwu",
--- 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/_")
--- 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
--- 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/_")
--- 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/_")
--- 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/_")
--- 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
--- 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/_")
--- 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/_")
--- 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/_")
--- 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/_")
--- 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/_")
--- 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/_")
--- 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/_")
--- 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/_")
--- 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
--- 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/_")
--- 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
--- 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/_")
--- 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
--- 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/_")
--- 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
--- 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/_")
--- 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
--- 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/_")
--- 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/_")
--- 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/_")