From e3af84a2025c0825006bada94139c17e545d5773 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Tue, 19 Sep 2023 13:45:07 -0700 Subject: [PATCH 1/2] [azure-messaging-eventhubs-cpp] Shorten source paths --- .../00100-shorten_paths.patch | 350 ++++++++++++++++++ .../portfile.cmake | 4 +- .../azure-messaging-eventhubs-cpp/vcpkg.json | 1 + .../a-/azure-messaging-eventhubs-cpp.json | 5 + versions/baseline.json | 2 +- 5 files changed, 360 insertions(+), 2 deletions(-) create mode 100644 ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch diff --git a/ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch b/ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch new file mode 100644 index 00000000000000..5b250fcfd1caf7 --- /dev/null +++ b/ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch @@ -0,0 +1,350 @@ +diff --git a/sdk/eventhubs/CMakeLists.txt b/sdk/eventhubs/CMakeLists.txt +index 4cf10b5b..bcf386ab 100644 +--- a/sdk/eventhubs/CMakeLists.txt ++++ b/sdk/eventhubs/CMakeLists.txt +@@ -8,4 +8,4 @@ set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + +-add_subdirectory(azure-messaging-eventhubs) ++add_subdirectory(eventhubs) +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/eventhubs/CHANGELOG.md +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md +rename to sdk/eventhubs/eventhubs/CHANGELOG.md +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/eventhubs/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/LICENSE b/sdk/eventhubs/eventhubs/LICENSE +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/LICENSE +rename to sdk/eventhubs/eventhubs/LICENSE +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/eventhubs/README.md +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/README.md +rename to sdk/eventhubs/eventhubs/README.md +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/ApiViewSettings.json b/sdk/eventhubs/eventhubs/inc/ApiViewSettings.json +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/ApiViewSettings.json +rename to sdk/eventhubs/eventhubs/inc/ApiViewSettings.json +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/rtti.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/rtti.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/rtti.hpp +rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/rtti.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/samples/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/README.md b/sdk/eventhubs/eventhubs/samples/README.md +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/README.md +rename to sdk/eventhubs/eventhubs/samples/README.md +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/basic-operations/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/samples/basic-operations/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer.cpp +rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer_aad.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer_aad.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer_aad.cpp +rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer_aad.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_producer.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer.cpp +rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_producer.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer_aad.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_producer_aad.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer_aad.cpp +rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_producer_aad.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/consume-events/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/samples/consume-events/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp b/sdk/eventhubs/eventhubs/samples/consume-events/consume_events.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp +rename to sdk/eventhubs/eventhubs/samples/consume-events/consume_events.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events_aad.cpp b/sdk/eventhubs/eventhubs/samples/consume-events/consume_events_aad.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events_aad.cpp +rename to sdk/eventhubs/eventhubs/samples/consume-events/consume_events_aad.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/produce-events/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/samples/produce-events/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events.cpp b/sdk/eventhubs/eventhubs/samples/produce-events/produce_events.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events.cpp +rename to sdk/eventhubs/eventhubs/samples/produce-events/produce_events.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events_aad.cpp b/sdk/eventhubs/eventhubs/samples/produce-events/produce_events_aad.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events_aad.cpp +rename to sdk/eventhubs/eventhubs/samples/produce-events/produce_events_aad.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/checkpoint_store.cpp b/sdk/eventhubs/eventhubs/src/checkpoint_store.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/checkpoint_store.cpp +rename to sdk/eventhubs/eventhubs/src/checkpoint_store.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp b/sdk/eventhubs/eventhubs/src/consumer_client.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp +rename to sdk/eventhubs/eventhubs/src/consumer_client.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/event_data.cpp b/sdk/eventhubs/eventhubs/src/event_data.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/event_data.cpp +rename to sdk/eventhubs/eventhubs/src/event_data.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/event_data_batch.cpp b/sdk/eventhubs/eventhubs/src/event_data_batch.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/event_data_batch.cpp +rename to sdk/eventhubs/eventhubs/src/event_data_batch.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp b/sdk/eventhubs/eventhubs/src/eventhubs_utilities.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp +rename to sdk/eventhubs/eventhubs/src/eventhubs_utilities.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp b/sdk/eventhubs/eventhubs/src/partition_client.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp +rename to sdk/eventhubs/eventhubs/src/partition_client.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client_models.cpp b/sdk/eventhubs/eventhubs/src/partition_client_models.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/partition_client_models.cpp +rename to sdk/eventhubs/eventhubs/src/partition_client_models.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_constants.hpp b/sdk/eventhubs/eventhubs/src/private/eventhubs_constants.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_constants.hpp +rename to sdk/eventhubs/eventhubs/src/private/eventhubs_constants.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp b/sdk/eventhubs/eventhubs/src/private/eventhubs_utilities.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp +rename to sdk/eventhubs/eventhubs/src/private/eventhubs_utilities.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/package_version.hpp b/sdk/eventhubs/eventhubs/src/private/package_version.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/package_version.hpp +rename to sdk/eventhubs/eventhubs/src/private/package_version.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp b/sdk/eventhubs/eventhubs/src/private/retry_operation.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp +rename to sdk/eventhubs/eventhubs/src/private/retry_operation.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/processor_load_balancer.cpp b/sdk/eventhubs/eventhubs/src/processor_load_balancer.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/processor_load_balancer.cpp +rename to sdk/eventhubs/eventhubs/src/processor_load_balancer.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/processor_partition_client.cpp b/sdk/eventhubs/eventhubs/src/processor_partition_client.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/processor_partition_client.cpp +rename to sdk/eventhubs/eventhubs/src/processor_partition_client.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp b/sdk/eventhubs/eventhubs/src/producer_client.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp +rename to sdk/eventhubs/eventhubs/src/producer_client.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp b/sdk/eventhubs/eventhubs/src/retry_operation.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp +rename to sdk/eventhubs/eventhubs/src/retry_operation.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test-resources-post.ps1 b/sdk/eventhubs/eventhubs/test-resources-post.ps1 +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test-resources-post.ps1 +rename to sdk/eventhubs/eventhubs/test-resources-post.ps1 +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test-resources.json b/sdk/eventhubs/eventhubs/test-resources.json +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test-resources.json +rename to sdk/eventhubs/eventhubs/test-resources.json +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/test/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.dockerignore b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.dockerignore +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.dockerignore +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.dockerignore +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.helmignore b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.helmignore +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.helmignore +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.helmignore +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.lock b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.lock +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.lock +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.lock +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.yaml b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.yaml +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.yaml +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.yaml +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Dockerfile b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Dockerfile +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Dockerfile +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Dockerfile +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/README.md b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/README.md +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/README.md +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/README.md +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/deploy.ps1 b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/deploy.ps1 +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/deploy.ps1 +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/deploy.ps1 +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml +rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/perf/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/perf/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/perf/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/test/perf/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp b/sdk/eventhubs/eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp +rename to sdk/eventhubs/eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp b/sdk/eventhubs/eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp +rename to sdk/eventhubs/eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/ut/CMakeLists.txt +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt +rename to sdk/eventhubs/eventhubs/test/ut/CMakeLists.txt +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/checkpoint_store_test.cpp b/sdk/eventhubs/eventhubs/test/ut/checkpoint_store_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/checkpoint_store_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/checkpoint_store_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/consumer_client_test.cpp b/sdk/eventhubs/eventhubs/test/ut/consumer_client_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/consumer_client_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/consumer_client_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/event_data_test.cpp b/sdk/eventhubs/eventhubs/test/ut/event_data_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/event_data_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/event_data_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/eventhubs_test_base.hpp b/sdk/eventhubs/eventhubs/test/ut/eventhubs_test_base.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/eventhubs_test_base.hpp +rename to sdk/eventhubs/eventhubs/test/ut/eventhubs_test_base.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_load_balancer_test.cpp b/sdk/eventhubs/eventhubs/test/ut/processor_load_balancer_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_load_balancer_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/processor_load_balancer_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp b/sdk/eventhubs/eventhubs/test/ut/processor_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/processor_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/producer_client_test.cpp b/sdk/eventhubs/eventhubs/test/ut/producer_client_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/producer_client_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/producer_client_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/retry_operation_test.cpp b/sdk/eventhubs/eventhubs/test/ut/retry_operation_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/retry_operation_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/retry_operation_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/round_trip_test.cpp b/sdk/eventhubs/eventhubs/test/ut/round_trip_test.cpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/round_trip_test.cpp +rename to sdk/eventhubs/eventhubs/test/ut/round_trip_test.cpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/test_checkpoint_store.hpp b/sdk/eventhubs/eventhubs/test/ut/test_checkpoint_store.hpp +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/test_checkpoint_store.hpp +rename to sdk/eventhubs/eventhubs/test/ut/test_checkpoint_store.hpp +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg.json b/sdk/eventhubs/eventhubs/vcpkg.json +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg.json +rename to sdk/eventhubs/eventhubs/vcpkg.json +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/Config.cmake.in b/sdk/eventhubs/eventhubs/vcpkg/Config.cmake.in +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg/Config.cmake.in +rename to sdk/eventhubs/eventhubs/vcpkg/Config.cmake.in +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake b/sdk/eventhubs/eventhubs/vcpkg/portfile.cmake +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake +rename to sdk/eventhubs/eventhubs/vcpkg/portfile.cmake +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json b/sdk/eventhubs/eventhubs/vcpkg/vcpkg.json +similarity index 100% +rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json +rename to sdk/eventhubs/eventhubs/vcpkg/vcpkg.json diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index 94f05dec1430c5..6c4b5605a0db01 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -3,10 +3,12 @@ vcpkg_from_github( REPO Azure/azure-sdk-for-cpp REF azure-messaging-eventhubs_1.0.0-beta.2 SHA512 3677edf50218c39e378a968661c0ec0600b8760d3af33f204f3267e104449c0aef42b9520cb63b5e5810b89bf91f06979d009ffdd6d6d04d2c14e1a21f0e111f + PATCHES + 00100-shorten_paths.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs/" + SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/eventhubs/" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index af878a993af25f..4270cac3735138 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-messaging-eventhubs-cpp", "version-semver": "1.0.0-beta.2", + "port-version": 1, "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index a4cf2dcd13c5ff..bbe4a2a6eecb21 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab9b659e0aacad5128c5f8a1bd6923afd8119007", + "version-semver": "1.0.0-beta.2", + "port-version": 1 + }, { "git-tree": "983c9c2a6615afc22cd76bdbbef3f403a608bbbf", "version-semver": "1.0.0-beta.2", diff --git a/versions/baseline.json b/versions/baseline.json index def79f99747098..fdbe69ad6eab0a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -438,7 +438,7 @@ }, "azure-messaging-eventhubs-cpp": { "baseline": "1.0.0-beta.2", - "port-version": 0 + "port-version": 1 }, "azure-security-attestation-cpp": { "baseline": "1.1.0", From affc1e0a96fe123e8ca15052b68f9eb44811398e Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 20 Sep 2023 11:38:44 -0700 Subject: [PATCH 2/2] use cmake to rename directories, and also include azure-storage ports --- .../00100-shorten_paths.patch | 350 ------------------ .../portfile.cmake | 4 +- ports/azure-storage-blobs-cpp/portfile.cmake | 4 +- ports/azure-storage-blobs-cpp/vcpkg.json | 1 + ports/azure-storage-common-cpp/portfile.cmake | 4 +- ports/azure-storage-common-cpp/vcpkg.json | 1 + .../portfile.cmake | 4 +- .../vcpkg.json | 1 + .../portfile.cmake | 4 +- .../azure-storage-files-shares-cpp/vcpkg.json | 1 + ports/azure-storage-queues-cpp/portfile.cmake | 4 +- ports/azure-storage-queues-cpp/vcpkg.json | 1 + .../a-/azure-messaging-eventhubs-cpp.json | 2 +- versions/a-/azure-storage-blobs-cpp.json | 5 + versions/a-/azure-storage-common-cpp.json | 5 + .../a-/azure-storage-files-datalake-cpp.json | 5 + .../a-/azure-storage-files-shares-cpp.json | 5 + versions/a-/azure-storage-queues-cpp.json | 5 + versions/baseline.json | 10 +- 19 files changed, 53 insertions(+), 363 deletions(-) delete mode 100644 ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch diff --git a/ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch b/ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch deleted file mode 100644 index 5b250fcfd1caf7..00000000000000 --- a/ports/azure-messaging-eventhubs-cpp/00100-shorten_paths.patch +++ /dev/null @@ -1,350 +0,0 @@ -diff --git a/sdk/eventhubs/CMakeLists.txt b/sdk/eventhubs/CMakeLists.txt -index 4cf10b5b..bcf386ab 100644 ---- a/sdk/eventhubs/CMakeLists.txt -+++ b/sdk/eventhubs/CMakeLists.txt -@@ -8,4 +8,4 @@ set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - --add_subdirectory(azure-messaging-eventhubs) -+add_subdirectory(eventhubs) -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/eventhubs/CHANGELOG.md -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md -rename to sdk/eventhubs/eventhubs/CHANGELOG.md -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/eventhubs/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/LICENSE b/sdk/eventhubs/eventhubs/LICENSE -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/LICENSE -rename to sdk/eventhubs/eventhubs/LICENSE -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/eventhubs/README.md -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/README.md -rename to sdk/eventhubs/eventhubs/README.md -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/ApiViewSettings.json b/sdk/eventhubs/eventhubs/inc/ApiViewSettings.json -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/ApiViewSettings.json -rename to sdk/eventhubs/eventhubs/inc/ApiViewSettings.json -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/checkpoint_store.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/dll_import_export.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/event_data_batch.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/consumer_client_models.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/management_models.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/partition_client_models.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/models/processor_models.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_load_balancer.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/rtti.hpp b/sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/rtti.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/rtti.hpp -rename to sdk/eventhubs/eventhubs/inc/azure/messaging/eventhubs/rtti.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/samples/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/README.md b/sdk/eventhubs/eventhubs/samples/README.md -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/README.md -rename to sdk/eventhubs/eventhubs/samples/README.md -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/basic-operations/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/samples/basic-operations/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer.cpp -rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer_aad.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer_aad.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_consumer_aad.cpp -rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_consumer_aad.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_producer.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer.cpp -rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_producer.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer_aad.cpp b/sdk/eventhubs/eventhubs/samples/basic-operations/create_producer_aad.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/basic-operations/create_producer_aad.cpp -rename to sdk/eventhubs/eventhubs/samples/basic-operations/create_producer_aad.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/consume-events/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/samples/consume-events/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp b/sdk/eventhubs/eventhubs/samples/consume-events/consume_events.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp -rename to sdk/eventhubs/eventhubs/samples/consume-events/consume_events.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events_aad.cpp b/sdk/eventhubs/eventhubs/samples/consume-events/consume_events_aad.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events_aad.cpp -rename to sdk/eventhubs/eventhubs/samples/consume-events/consume_events_aad.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/CMakeLists.txt b/sdk/eventhubs/eventhubs/samples/produce-events/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/samples/produce-events/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events.cpp b/sdk/eventhubs/eventhubs/samples/produce-events/produce_events.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events.cpp -rename to sdk/eventhubs/eventhubs/samples/produce-events/produce_events.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events_aad.cpp b/sdk/eventhubs/eventhubs/samples/produce-events/produce_events_aad.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/samples/produce-events/produce_events_aad.cpp -rename to sdk/eventhubs/eventhubs/samples/produce-events/produce_events_aad.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/checkpoint_store.cpp b/sdk/eventhubs/eventhubs/src/checkpoint_store.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/checkpoint_store.cpp -rename to sdk/eventhubs/eventhubs/src/checkpoint_store.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp b/sdk/eventhubs/eventhubs/src/consumer_client.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp -rename to sdk/eventhubs/eventhubs/src/consumer_client.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/event_data.cpp b/sdk/eventhubs/eventhubs/src/event_data.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/event_data.cpp -rename to sdk/eventhubs/eventhubs/src/event_data.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/event_data_batch.cpp b/sdk/eventhubs/eventhubs/src/event_data_batch.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/event_data_batch.cpp -rename to sdk/eventhubs/eventhubs/src/event_data_batch.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp b/sdk/eventhubs/eventhubs/src/eventhubs_utilities.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp -rename to sdk/eventhubs/eventhubs/src/eventhubs_utilities.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp b/sdk/eventhubs/eventhubs/src/partition_client.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp -rename to sdk/eventhubs/eventhubs/src/partition_client.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client_models.cpp b/sdk/eventhubs/eventhubs/src/partition_client_models.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/partition_client_models.cpp -rename to sdk/eventhubs/eventhubs/src/partition_client_models.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_constants.hpp b/sdk/eventhubs/eventhubs/src/private/eventhubs_constants.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_constants.hpp -rename to sdk/eventhubs/eventhubs/src/private/eventhubs_constants.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp b/sdk/eventhubs/eventhubs/src/private/eventhubs_utilities.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp -rename to sdk/eventhubs/eventhubs/src/private/eventhubs_utilities.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/package_version.hpp b/sdk/eventhubs/eventhubs/src/private/package_version.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/package_version.hpp -rename to sdk/eventhubs/eventhubs/src/private/package_version.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp b/sdk/eventhubs/eventhubs/src/private/retry_operation.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp -rename to sdk/eventhubs/eventhubs/src/private/retry_operation.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/processor_load_balancer.cpp b/sdk/eventhubs/eventhubs/src/processor_load_balancer.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/processor_load_balancer.cpp -rename to sdk/eventhubs/eventhubs/src/processor_load_balancer.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/processor_partition_client.cpp b/sdk/eventhubs/eventhubs/src/processor_partition_client.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/processor_partition_client.cpp -rename to sdk/eventhubs/eventhubs/src/processor_partition_client.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp b/sdk/eventhubs/eventhubs/src/producer_client.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp -rename to sdk/eventhubs/eventhubs/src/producer_client.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp b/sdk/eventhubs/eventhubs/src/retry_operation.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp -rename to sdk/eventhubs/eventhubs/src/retry_operation.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test-resources-post.ps1 b/sdk/eventhubs/eventhubs/test-resources-post.ps1 -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test-resources-post.ps1 -rename to sdk/eventhubs/eventhubs/test-resources-post.ps1 -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test-resources.json b/sdk/eventhubs/eventhubs/test-resources.json -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test-resources.json -rename to sdk/eventhubs/eventhubs/test-resources.json -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/test/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.dockerignore b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.dockerignore -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.dockerignore -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.dockerignore -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.helmignore b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.helmignore -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/.helmignore -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/.helmignore -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.lock b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.lock -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.lock -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.lock -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.yaml b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.yaml -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Chart.yaml -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Chart.yaml -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Dockerfile b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Dockerfile -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/Dockerfile -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/Dockerfile -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/README.md b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/README.md -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/README.md -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/README.md -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/deploy.ps1 b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/deploy.ps1 -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/deploy.ps1 -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/deploy.ps1 -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/eventhubs_stress_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/scenarios-matrix.yaml -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/stress-test-resources.bicep -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml b/sdk/eventhubs/eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml -rename to sdk/eventhubs/eventhubs/test/eventhubs-stress-test/templates/deploy-job.yaml -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/perf/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/perf/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/perf/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/test/perf/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp b/sdk/eventhubs/eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp -rename to sdk/eventhubs/eventhubs/test/perf/inc/azure/messaging/eventhubs/test/eventhubs_batch_perf_test.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp b/sdk/eventhubs/eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp -rename to sdk/eventhubs/eventhubs/test/perf/src/azure_eventhubs_perf_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt b/sdk/eventhubs/eventhubs/test/ut/CMakeLists.txt -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt -rename to sdk/eventhubs/eventhubs/test/ut/CMakeLists.txt -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/checkpoint_store_test.cpp b/sdk/eventhubs/eventhubs/test/ut/checkpoint_store_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/checkpoint_store_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/checkpoint_store_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/consumer_client_test.cpp b/sdk/eventhubs/eventhubs/test/ut/consumer_client_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/consumer_client_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/consumer_client_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/event_data_test.cpp b/sdk/eventhubs/eventhubs/test/ut/event_data_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/event_data_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/event_data_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/eventhubs_test_base.hpp b/sdk/eventhubs/eventhubs/test/ut/eventhubs_test_base.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/eventhubs_test_base.hpp -rename to sdk/eventhubs/eventhubs/test/ut/eventhubs_test_base.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_load_balancer_test.cpp b/sdk/eventhubs/eventhubs/test/ut/processor_load_balancer_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_load_balancer_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/processor_load_balancer_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp b/sdk/eventhubs/eventhubs/test/ut/processor_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/processor_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/producer_client_test.cpp b/sdk/eventhubs/eventhubs/test/ut/producer_client_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/producer_client_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/producer_client_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/retry_operation_test.cpp b/sdk/eventhubs/eventhubs/test/ut/retry_operation_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/retry_operation_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/retry_operation_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/round_trip_test.cpp b/sdk/eventhubs/eventhubs/test/ut/round_trip_test.cpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/round_trip_test.cpp -rename to sdk/eventhubs/eventhubs/test/ut/round_trip_test.cpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/test_checkpoint_store.hpp b/sdk/eventhubs/eventhubs/test/ut/test_checkpoint_store.hpp -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/test/ut/test_checkpoint_store.hpp -rename to sdk/eventhubs/eventhubs/test/ut/test_checkpoint_store.hpp -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg.json b/sdk/eventhubs/eventhubs/vcpkg.json -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg.json -rename to sdk/eventhubs/eventhubs/vcpkg.json -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/Config.cmake.in b/sdk/eventhubs/eventhubs/vcpkg/Config.cmake.in -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg/Config.cmake.in -rename to sdk/eventhubs/eventhubs/vcpkg/Config.cmake.in -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake b/sdk/eventhubs/eventhubs/vcpkg/portfile.cmake -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake -rename to sdk/eventhubs/eventhubs/vcpkg/portfile.cmake -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json b/sdk/eventhubs/eventhubs/vcpkg/vcpkg.json -similarity index 100% -rename from sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json -rename to sdk/eventhubs/eventhubs/vcpkg/vcpkg.json diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index 6c4b5605a0db01..43338b3c8f251c 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -3,10 +3,10 @@ vcpkg_from_github( REPO Azure/azure-sdk-for-cpp REF azure-messaging-eventhubs_1.0.0-beta.2 SHA512 3677edf50218c39e378a968661c0ec0600b8760d3af33f204f3267e104449c0aef42b9520cb63b5e5810b89bf91f06979d009ffdd6d6d04d2c14e1a21f0e111f - PATCHES - 00100-shorten_paths.patch ) +file(RENAME ${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs/ ${SOURCE_PATH}/sdk/eventhubs/eventhubs/) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/eventhubs/" OPTIONS diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 5d7f8e1c7c3d36..001e173b184226 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -5,8 +5,10 @@ vcpkg_from_github( SHA512 10126fa8f34357d941cc7ac031c7811cdbf5fe998d2b6741e9e97325c67df5ed9c490ec42034d9b1ba56716e7de3b7283eb9059554d32b2f4d907e839b64b59f ) +file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/ ${SOURCE_PATH}/sdk/storage/blobs/) + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-blobs/" + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/blobs/" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 42aa4e2c829a1e..178263c79d9286 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-blobs-cpp", "version-semver": "12.9.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index e1abaa343e6089..14c71fb3632783 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -5,8 +5,10 @@ vcpkg_from_github( SHA512 999bbd93b645849720d2fd4401b8f9e9f12ce31ea1362786cd1aa0392efd0a05de717d87b2db43a190c2a40f42477daddebcc00812efc4de3ccc08e7563001dd ) +file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-common/ ${SOURCE_PATH}/sdk/storage/common/) + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/" + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/common/" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 9dc02788bd0193..3040c4efb2a1bf 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-common-cpp", "version-semver": "12.4.0", + "port-version": 1, "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index 336c85c88ef8f4..7e5fe730f17825 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -5,8 +5,10 @@ vcpkg_from_github( SHA512 4539b8ba806abdf71cdf82e2bdcffe1adae1d19e6ea62f72cea6ac7e0beef32895d13cff53df4afe06b53ed5740c19bba858c09f75b74cd446d5c125e36ca2b3 ) +file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/ ${SOURCE_PATH}/sdk/storage/files-datalake/) + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/" + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/files-datalake/" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index aa21451a22685a..d9e2670e66d621 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-files-datalake-cpp", "version-semver": "12.8.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 4ee777c41cf264..4c36e8ff01b784 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -5,8 +5,10 @@ vcpkg_from_github( SHA512 2482a7c437bd36e63efc8c77d917a09d73bde2bc12d49afd1e24cf0977656e991c59c15d34b52c1bd19c6988fe7c40c95b5edea8740977ffc676f3dd6758dc5e ) +file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/ ${SOURCE_PATH}/sdk/storage/files-shares/) + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/" + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/files-shares/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index b8729155f8aa6a..dca31f29e90dc5 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-files-shares-cpp", "version-semver": "12.7.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index 6642f2f2575fca..f69d3fa8f91d69 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -5,8 +5,10 @@ vcpkg_from_github( SHA512 98f1b44f408418e43aedf57392c79a625348bbbe516a84d1682486d77655851546e191ea409397cc5c0d822d77bfe9ee2628e9a581334abe86d478418ac0ba9d ) +file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-queues/ ${SOURCE_PATH}/sdk/storage/queues/) + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-queues/" + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/queues/" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index 2680bb631d83a9..003196aa8b9977 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-queues-cpp", "version-semver": "12.1.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index bbe4a2a6eecb21..024cfe675bdd12 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ab9b659e0aacad5128c5f8a1bd6923afd8119007", + "git-tree": "b1715fef4799906d6fde88fa59d4033c875be7b6", "version-semver": "1.0.0-beta.2", "port-version": 1 }, diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 819a6116f1accb..f604e00e7e1170 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdb23253d087d42e823bcdeb4cf30315bfd2b738", + "version-semver": "12.9.0", + "port-version": 1 + }, { "git-tree": "b0699f9368ea7fbc2c6528711c29eb896c76d0a6", "version-semver": "12.9.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 897b6d897d40df..370e52f0a89130 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "836c01e2a89e5e454222f43d2231add4269b238c", + "version-semver": "12.4.0", + "port-version": 1 + }, { "git-tree": "041e401b3394eefc002af8a93bccbb7edc0732b5", "version-semver": "12.4.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index 40c001be187256..7ce59ae0aea27c 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a8bbf51949c994e5f7679d1895ef0e88a2155fe", + "version-semver": "12.8.0", + "port-version": 1 + }, { "git-tree": "0f289490671675363d6e2e07eb6277c569602878", "version-semver": "12.8.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index fe9af5f9005dea..43133cee97d46d 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bea08d88a4cfbd285811868764d3957a29a36350", + "version-semver": "12.7.0", + "port-version": 1 + }, { "git-tree": "d1c2beb619e08e7c675312136c0cc427e3ee59e5", "version-semver": "12.7.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index f0454a1c53cba3..a08d91334e4d78 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96a1d1bf5643358e1701eae820f9caaebfd2bb66", + "version-semver": "12.1.0", + "port-version": 1 + }, { "git-tree": "31256aaa2dbb1508ea777fc03cbec8ddbfd9ca18", "version-semver": "12.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index fdbe69ad6eab0a..b1a0a13426262b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -462,11 +462,11 @@ }, "azure-storage-blobs-cpp": { "baseline": "12.9.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-common-cpp": { "baseline": "12.4.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-cpp": { "baseline": "7.5.0", @@ -474,15 +474,15 @@ }, "azure-storage-files-datalake-cpp": { "baseline": "12.8.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-files-shares-cpp": { "baseline": "12.7.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-queues-cpp": { "baseline": "12.1.0", - "port-version": 0 + "port-version": 1 }, "azure-uamqp-c": { "baseline": "2023-08-07",