From cde50734943d4f80f9579c489e3c762cc61641fc Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 25 Oct 2023 19:13:03 -0700 Subject: [PATCH 1/4] Ensure CMakeLists don't miss any files --- .../cmake-fetch-content/CMakeLists.txt | 2 +- .../vcpkg-all-smoke/CMakeLists.txt | 2 +- .../azure-security-attestation/CMakeLists.txt | 26 ++++---- .../policy-certificates/CMakeLists.txt | 4 +- .../samples/policy/CMakeLists.txt | 4 +- .../test/ut/CMakeLists.txt | 17 ++--- sdk/core/azure-core-amqp/CMakeLists.txt | 36 +++++++--- .../azure-core-amqp/test/ut/CMakeLists.txt | 3 +- .../test/ut_uamqp/CMakeLists.txt | 4 +- sdk/core/azure-core-test/CMakeLists.txt | 5 +- .../CMakeLists.txt | 9 ++- .../test/ut/CMakeLists.txt | 5 +- sdk/core/azure-core/CMakeLists.txt | 66 ++++++++++--------- sdk/core/azure-core/test/perf/CMakeLists.txt | 1 + sdk/core/azure-core/test/ut/CMakeLists.txt | 15 +++-- sdk/core/perf/CMakeLists.txt | 3 +- sdk/core/perf/test/CMakeLists.txt | 2 + .../CMakeLists.txt | 3 + .../test/ut/CMakeLists.txt | 1 + .../azure-messaging-eventhubs/CMakeLists.txt | 26 ++++---- .../test/ut/CMakeLists.txt | 20 +++--- sdk/identity/azure-identity/CMakeLists.txt | 18 ++--- .../CMakeLists.txt | 7 +- .../test/ut/CMakeLists.txt | 3 +- .../CMakeLists.txt | 15 +++-- .../test/ut/CMakeLists.txt | 5 +- .../CMakeLists.txt | 50 +++++++------- .../test/ut-hsm/CMakeLists.txt | 3 +- .../test/ut/CMakeLists.txt | 3 +- .../CMakeLists.txt | 14 ++-- .../test/ut/CMakeLists.txt | 13 ++-- .../azure-storage-blobs/CMakeLists.txt | 8 +-- .../test/ut/CMakeLists.txt | 4 +- .../azure-storage-common/CMakeLists.txt | 10 +-- .../CMakeLists.txt | 6 +- .../azure-storage-files-shares/CMakeLists.txt | 4 +- .../azure-storage-queues/CMakeLists.txt | 2 +- sdk/template/azure-template/CMakeLists.txt | 5 +- 38 files changed, 240 insertions(+), 184 deletions(-) diff --git a/samples/integration/cmake-fetch-content/CMakeLists.txt b/samples/integration/cmake-fetch-content/CMakeLists.txt index f1b7d35716..ac5d7c9406 100644 --- a/samples/integration/cmake-fetch-content/CMakeLists.txt +++ b/samples/integration/cmake-fetch-content/CMakeLists.txt @@ -23,7 +23,7 @@ endif() add_executable ( application - src/main + src/main.cpp ) # Link to Azure SDK diff --git a/samples/integration/vcpkg-all-smoke/CMakeLists.txt b/samples/integration/vcpkg-all-smoke/CMakeLists.txt index 6d5bb10c1e..9fd3c0981f 100644 --- a/samples/integration/vcpkg-all-smoke/CMakeLists.txt +++ b/samples/integration/vcpkg-all-smoke/CMakeLists.txt @@ -22,7 +22,7 @@ endif() add_executable ( vcpkg-all-smoke - src/main + src/main.cpp ) # Link to Azure SDK diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt index cda77c9697..bc6f48f877 100644 --- a/sdk/attestation/azure-security-attestation/CMakeLists.txt +++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt @@ -31,24 +31,20 @@ find_package(OpenSSL REQUIRED) set( AZURE_ATTESTATION_HEADER + inc/azure/attestation.hpp inc/azure/attestation/attestation_administration_client.hpp - inc/azure/attestation/attestation_client.hpp inc/azure/attestation/attestation_client_models.hpp inc/azure/attestation/attestation_client_options.hpp + inc/azure/attestation/attestation_client.hpp inc/azure/attestation/dll_import_export.hpp inc/azure/attestation/rtti.hpp - inc/azure/attestation.hpp ) set( AZURE_ATTESTATION_SOURCE - src/private/crypto/inc/crypto.hpp - src/private/crypto/openssl/openssl_helpers.hpp - src/private/crypto/openssl/opensslcert.cpp - src/private/crypto/openssl/opensslcert.hpp - src/private/crypto/openssl/opensslcrypto.cpp - src/private/crypto/openssl/opensslkeys.cpp - src/private/crypto/openssl/opensslkeys.hpp + src/attestation_administration_client.cpp + src/attestation_client_options.cpp + src/attestation_client.cpp src/private/attestation_client_models_private.hpp src/private/attestation_client_private.cpp src/private/attestation_client_private.hpp @@ -56,12 +52,16 @@ set( src/private/attestation_common_request.hpp src/private/attestation_deserializers_private.cpp src/private/attestation_deserializers_private.hpp - src/private/jsonhelpers.cpp src/private/jsonhelpers_private.hpp + src/private/jsonhelpers.cpp src/private/package_version.hpp - src/attestation_administration_client.cpp - src/attestation_client.cpp - src/attestation_client_options.cpp + src/private/crypto/inc/crypto.hpp + src/private/crypto/openssl/openssl_helpers.hpp + src/private/crypto/openssl/opensslcert.cpp + src/private/crypto/openssl/opensslcert.hpp + src/private/crypto/openssl/opensslcrypto.cpp + src/private/crypto/openssl/opensslkeys.cpp + src/private/crypto/openssl/opensslkeys.hpp ) add_library(azure-security-attestation ${AZURE_ATTESTATION_HEADER} ${AZURE_ATTESTATION_SOURCE}) diff --git a/sdk/attestation/azure-security-attestation/samples/policy-certificates/CMakeLists.txt b/sdk/attestation/azure-security-attestation/samples/policy-certificates/CMakeLists.txt index 77f7f84566..5e097362d7 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy-certificates/CMakeLists.txt +++ b/sdk/attestation/azure-security-attestation/samples/policy-certificates/CMakeLists.txt @@ -10,7 +10,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) macro (define_sample samplename) add_executable ( attestation-${samplename} - ${samplename}.cpp) + ${samplename}.cpp + cryptohelpers.hpp +) CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation-${samplename} attestation) diff --git a/sdk/attestation/azure-security-attestation/samples/policy/CMakeLists.txt b/sdk/attestation/azure-security-attestation/samples/policy/CMakeLists.txt index a17849a295..db9f592c10 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy/CMakeLists.txt +++ b/sdk/attestation/azure-security-attestation/samples/policy/CMakeLists.txt @@ -10,7 +10,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) macro (define_sample samplename) add_executable ( attestation-${samplename} - ${samplename}.cpp) + ${samplename}.cpp + cryptohelpers.hpp +) CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename}) diff --git a/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt b/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt index a1f74ae6b5..8a5f61d8d9 100644 --- a/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt +++ b/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt @@ -24,16 +24,17 @@ include(GoogleTest) add_executable ( azure-security-attestation-test - macro_guard.cpp - crypto_test.cpp - attestation_test.cpp - token_test.cpp - policygetset_test.cpp - attestation_collateral.cpp + attestation_collateral.cpp attestation_metadata.cpp - policycertmgmt_test.cpp - tpmattestation_test.cpp + attestation_test.cpp crypto_test_collateral.cpp + crypto_test_collateral.hpp + crypto_test.cpp + macro_guard.cpp + policycertmgmt_test.cpp + policygetset_test.cpp + token_test.cpp + tpmattestation_test.cpp ) create_per_service_target_build(attestation azure-security-attestation-test) diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt index 46b4a62753..7fc29f5035 100644 --- a/sdk/core/azure-core-amqp/CMakeLists.txt +++ b/sdk/core/azure-core-amqp/CMakeLists.txt @@ -56,39 +56,57 @@ find_package(azure_c_shared_utility CONFIG REQUIRED) set (AZURE_CORE_AMQP_HEADER + inc/azure/core/amqp.hpp inc/azure/core/amqp/cancellable.hpp inc/azure/core/amqp/claims_based_security.hpp - inc/azure/core/amqp/common/async_operation_queue.hpp - inc/azure/core/amqp/common/completion_operation.hpp - inc/azure/core/amqp/common/global_state.hpp - inc/azure/core/amqp/connection.hpp inc/azure/core/amqp/connection_string_credential.hpp + inc/azure/core/amqp/connection.hpp + inc/azure/core/amqp/dll_import_export.hpp + inc/azure/core/amqp/doxygen_pragma.hpp inc/azure/core/amqp/endpoint.hpp inc/azure/core/amqp/link.hpp + inc/azure/core/amqp/management.hpp inc/azure/core/amqp/message_receiver.hpp inc/azure/core/amqp/message_sender.hpp + inc/azure/core/amqp/rtti.hpp + inc/azure/core/amqp/session.hpp + inc/azure/core/amqp/common/async_operation_queue.hpp + inc/azure/core/amqp/common/completion_operation.hpp + inc/azure/core/amqp/common/global_state.hpp inc/azure/core/amqp/models/amqp_error.hpp inc/azure/core/amqp/models/amqp_header.hpp inc/azure/core/amqp/models/amqp_message.hpp inc/azure/core/amqp/models/amqp_properties.hpp - inc/azure/core/amqp/models/amqp_value.hpp inc/azure/core/amqp/models/amqp_protocol.hpp + inc/azure/core/amqp/models/amqp_value.hpp inc/azure/core/amqp/models/message_source.hpp inc/azure/core/amqp/models/message_target.hpp inc/azure/core/amqp/models/messaging_values.hpp - inc/azure/core/amqp/session.hpp + inc/azure/core/amqp/network/amqp_header_detect_transport.hpp + inc/azure/core/amqp/network/sasl_transport.hpp + inc/azure/core/amqp/network/socket_listener.hpp + inc/azure/core/amqp/network/socket_transport.hpp + inc/azure/core/amqp/network/tls_transport.hpp + inc/azure/core/amqp/network/transport.hpp ) set(AZURE_CORE_AMQP_SOURCE src/amqp/cancellable.cpp src/amqp/claim_based_security.cpp - src/amqp/connection.cpp src/amqp/connection_string_credential.cpp + src/amqp/connection.cpp src/amqp/link.cpp src/amqp/management.cpp src/amqp/message_receiver.cpp src/amqp/message_sender.cpp src/amqp/session.cpp + src/amqp/private/claims_based_security_impl.hpp + src/amqp/private/connection_impl.hpp + src/amqp/private/link_impl.hpp + src/amqp/private/management_impl.hpp + src/amqp/private/message_receiver_impl.hpp + src/amqp/private/message_sender_impl.hpp + src/amqp/private/session_impl.hpp src/common/global_state.cpp src/models/amqp_error.cpp src/models/amqp_header.cpp @@ -103,7 +121,9 @@ set(AZURE_CORE_AMQP_SOURCE src/network/socket_listener.cpp src/network/socket_transport.cpp src/network/tls_transport.cpp - src/network/transport.cpp + src/network/transport.cpp + src/network/private/transport_impl.hpp + src/private/package_version.hpp ) add_library(azure-core-amqp ${AZURE_CORE_AMQP_SOURCE} ${AZURE_CORE_AMQP_HEADER}) diff --git a/sdk/core/azure-core-amqp/test/ut/CMakeLists.txt b/sdk/core/azure-core-amqp/test/ut/CMakeLists.txt index 93d1864e51..eea684614e 100644 --- a/sdk/core/azure-core-amqp/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core-amqp/test/ut/CMakeLists.txt @@ -27,8 +27,9 @@ add_executable(azure-core-amqp-tests management_tests.cpp message_sender_receiver.cpp message_source_target.cpp + mock_amqp_server.hpp session_tests.cpp - transport_tests.cpp + transport_tests.cpp ) add_dependencies(azure-core-amqp-tests Azure::azure-core-amqp) diff --git a/sdk/core/azure-core-amqp/test/ut_uamqp/CMakeLists.txt b/sdk/core/azure-core-amqp/test/ut_uamqp/CMakeLists.txt index 5ab8f34d05..e5cf0c2279 100644 --- a/sdk/core/azure-core-amqp/test/ut_uamqp/CMakeLists.txt +++ b/sdk/core/azure-core-amqp/test/ut_uamqp/CMakeLists.txt @@ -27,7 +27,9 @@ find_package(azure_c_shared_utility CONFIG REQUIRED) # Unit Tests add_executable(azure-core-amqp-uamqp-tests amqp_error_tests.cpp - "amqp_insertion_tests.cpp") + amqp_insertion_tests.cpp +) + add_dependencies(azure-core-amqp-uamqp-tests Azure::azure-core-amqp uamqp) # UAMQP Definitions and headers. diff --git a/sdk/core/azure-core-test/CMakeLists.txt b/sdk/core/azure-core-test/CMakeLists.txt index 9537861376..c52e2dddf9 100644 --- a/sdk/core/azure-core-test/CMakeLists.txt +++ b/sdk/core/azure-core-test/CMakeLists.txt @@ -14,14 +14,15 @@ set( inc/azure/core/test/test_base.hpp inc/azure/core/test/test_context_manager.hpp inc/azure/core/test/test_proxy_manager.hpp + inc/azure/core/test/test_proxy_policy.hpp ) set( AZURE_CORE_TEST_SOURCE - src/private/package_version.hpp - src/test_proxy_policy.cpp src/test_base.cpp src/test_proxy_manager.cpp + src/test_proxy_policy.cpp + src/private/package_version.hpp ) add_library ( diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt index 09dadbbde2..5b1ab5e589 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt @@ -40,14 +40,17 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) set( AZURE_CORE_OPENTELEMETRY_HEADER - inc/azure/core/tracing/opentelemetry/internal/apiview.hpp + inc/azure/core/tracing/opentelemetry/dll_import_export.hpp inc/azure/core/tracing/opentelemetry/opentelemetry.hpp - src/opentelemetry_private.hpp + inc/azure/core/tracing/opentelemetry/rtti.hpp + inc/azure/core/tracing/opentelemetry/internal/apiview.hpp ) set( AZURE_CORE_OPENTELEMETRY_SOURCE - src/opentelemetry.cpp + src/opentelemetry_private.hpp + src/opentelemetry.cpp + src/private/package_version.hpp ) add_library(azure-core-tracing-opentelemetry ${AZURE_CORE_OPENTELEMETRY_HEADER} ${AZURE_CORE_OPENTELEMETRY_SOURCE}) diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt index 1701c63705..3003a46b37 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt @@ -29,7 +29,10 @@ include(GoogleTest) add_executable ( azure-core-tracing-opentelemetry-test azure_core_otel_test.cpp - azure_core_test.cpp service_support_test.cpp) + azure_core_test.cpp + service_support_test.cpp + test_exporter.hpp +) if (MSVC) # Disable warnings: diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt index d55026630b..d62e62c1d3 100644 --- a/sdk/core/azure-core/CMakeLists.txt +++ b/sdk/core/azure-core/CMakeLists.txt @@ -62,54 +62,56 @@ set( AZURE_CORE_HEADER ${CURL_TRANSPORT_ADAPTER_INC} ${WIN_TRANSPORT_ADAPTER_INC} - inc/azure/core.hpp + inc/azure/core.hpp inc/azure/core/azure_assert.hpp inc/azure/core/base64.hpp inc/azure/core/case_insensitive_containers.hpp inc/azure/core/context.hpp - inc/azure/core/credentials/credentials.hpp - inc/azure/core/credentials/token_credential_options.hpp - inc/azure/core/cryptography/hash.hpp inc/azure/core/datetime.hpp - inc/azure/core/diagnostics/logger.hpp inc/azure/core/dll_import_export.hpp inc/azure/core/etag.hpp inc/azure/core/exception.hpp - inc/azure/core/http/http.hpp + inc/azure/core/match_conditions.hpp + inc/azure/core/modified_conditions.hpp + inc/azure/core/nullable.hpp + inc/azure/core/operation_status.hpp + inc/azure/core/operation.hpp + inc/azure/core/paged_response.hpp + inc/azure/core/platform.hpp + inc/azure/core/response.hpp + inc/azure/core/rtti.hpp + inc/azure/core/url.hpp + inc/azure/core/uuid.hpp + inc/azure/core/credentials/credentials.hpp + inc/azure/core/credentials/token_credential_options.hpp + inc/azure/core/cryptography/hash.hpp + inc/azure/core/diagnostics/logger.hpp inc/azure/core/http/http_status_code.hpp - inc/azure/core/http/policies/policy.hpp + inc/azure/core/http/http.hpp inc/azure/core/http/raw_response.hpp inc/azure/core/http/transport.hpp - inc/azure/core/internal/credentials/authorization_challenge_parser.hpp + inc/azure/core/http/policies/policy.hpp inc/azure/core/internal/client_options.hpp inc/azure/core/internal/contract.hpp - inc/azure/core/internal/cryptography/sha_hash.hpp - inc/azure/core/internal/diagnostics/log.hpp inc/azure/core/internal/environment.hpp inc/azure/core/internal/extendable_enumeration.hpp + inc/azure/core/internal/strings.hpp + inc/azure/core/internal/unique_handle.hpp + inc/azure/core/internal/credentials/authorization_challenge_parser.hpp + inc/azure/core/internal/cryptography/sha_hash.hpp + inc/azure/core/internal/diagnostics/global_exception.hpp + inc/azure/core/internal/diagnostics/log.hpp inc/azure/core/internal/http/http_sanitizer.hpp inc/azure/core/internal/http/pipeline.hpp inc/azure/core/internal/http/user_agent.hpp inc/azure/core/internal/io/null_body_stream.hpp - inc/azure/core/internal/json/json.hpp inc/azure/core/internal/json/json_optional.hpp inc/azure/core/internal/json/json_serializable.hpp - inc/azure/core/internal/strings.hpp + inc/azure/core/internal/json/json.hpp inc/azure/core/internal/tracing/service_tracing.hpp inc/azure/core/internal/tracing/tracing_impl.hpp inc/azure/core/io/body_stream.hpp - inc/azure/core/match_conditions.hpp - inc/azure/core/modified_conditions.hpp - inc/azure/core/nullable.hpp - inc/azure/core/operation.hpp - inc/azure/core/operation_status.hpp - inc/azure/core/paged_response.hpp - inc/azure/core/platform.hpp - inc/azure/core/response.hpp - inc/azure/core/rtti.hpp inc/azure/core/tracing/tracing.hpp - inc/azure/core/url.hpp - inc/azure/core/uuid.hpp ) set( @@ -119,22 +121,25 @@ set( src/azure_assert.cpp src/base64.cpp src/context.cpp - src/credentials/authorization_challenge_parser.cpp - src/cryptography/md5.cpp - src/cryptography/sha_hash.cpp src/datetime.cpp - src/environment.cpp src/environment_log_level_listener.cpp + src/environment.cpp src/etag.cpp src/exception.cpp + src/logger.cpp + src/operation_status.cpp + src/uuid.cpp + src/credentials/authorization_challenge_parser.cpp + src/cryptography/md5.cpp + src/cryptography/sha_hash.cpp src/http/bearer_token_authentication_policy.cpp - src/http/http.cpp src/http/http_sanitizer.cpp + src/http/http.cpp src/http/log_policy.cpp src/http/policy.cpp src/http/raw_response.cpp - src/http/request.cpp src/http/request_activity_policy.cpp + src/http/request.cpp src/http/retry_policy.cpp src/http/telemetry_policy.cpp src/http/transport_policy.cpp @@ -142,12 +147,9 @@ set( src/http/user_agent.cpp src/io/body_stream.cpp src/io/random_access_file_body_stream.cpp - src/logger.cpp - src/operation_status.cpp src/private/environment_log_level_listener.hpp src/private/package_version.hpp src/tracing/tracing.cpp - src/uuid.cpp ) add_library(azure-core ${AZURE_CORE_HEADER} ${AZURE_CORE_SOURCE}) diff --git a/sdk/core/azure-core/test/perf/CMakeLists.txt b/sdk/core/azure-core/test/perf/CMakeLists.txt index 506fe96c20..167e77ae3a 100644 --- a/sdk/core/azure-core/test/perf/CMakeLists.txt +++ b/sdk/core/azure-core/test/perf/CMakeLists.txt @@ -10,6 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) set( AZURE_CORE_PERF_TEST_HEADER inc/azure/core/test/nullable_test.hpp + inc/azure/core/test/uuid_test.hpp ) set( diff --git a/sdk/core/azure-core/test/ut/CMakeLists.txt b/sdk/core/azure-core/test/ut/CMakeLists.txt index 8b4194e528..3231937292 100644 --- a/sdk/core/azure-core/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core/test/ut/CMakeLists.txt @@ -28,6 +28,7 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED True) if(BUILD_TRANSPORT_CURL) + SET(CURL_AZURE_CORE_MAIN_TEST azure_libcurl_core_main_test.cpp) SET(CURL_OPTIONS_TESTS curl_options_test.cpp) SET(CURL_SESSION_TESTS curl_session_test_test.cpp curl_session_test.hpp) SET(CURL_CONNECTION_POOL_TESTS curl_connection_pool_test.cpp) @@ -46,6 +47,10 @@ endif() add_executable ( azure-core-test + ${CURL_AZURE_CORE_MAIN_TEST} + ${CURL_CONNECTION_POOL_TESTS} + ${CURL_OPTIONS_TESTS} + ${CURL_SESSION_TESTS} assert_test.cpp authorization_challenge_parser_test.cpp azure_core_test.cpp @@ -55,17 +60,15 @@ add_executable ( case_insensitive_containers_test.cpp client_options_test.cpp context_test.cpp - ${CURL_CONNECTION_POOL_TESTS} - ${CURL_OPTIONS_TESTS} - ${CURL_SESSION_TESTS} datetime_test.cpp environment_log_level_listener_test.cpp - extendable_enumeration_test.cpp etag_test.cpp exception_test.cpp + extendable_enumeration_test.cpp + global_context_test.cpp + http_method_test.cpp http_test.cpp http_test.hpp - http_method_test.cpp json_test.cpp log_policy_test.cpp logging_test.cpp @@ -74,9 +77,9 @@ add_executable ( md5_test.cpp modified_conditions_test.cpp nullable_test.cpp + operation_status_test.cpp operation_test.cpp operation_test.hpp - operation_status_test.cpp pipeline_test.cpp policy_test.cpp request_activity_policy_test.cpp diff --git a/sdk/core/perf/CMakeLists.txt b/sdk/core/perf/CMakeLists.txt index b132c3cc11..98643289ad 100644 --- a/sdk/core/perf/CMakeLists.txt +++ b/sdk/core/perf/CMakeLists.txt @@ -14,6 +14,7 @@ include(AzureTransportAdapters) set( AZURE_PERFORMANCE_HEADER + inc/azure/perf.hpp inc/azure/perf/argagg.hpp inc/azure/perf/base_test.hpp inc/azure/perf/dynamic_test_options.hpp @@ -21,8 +22,8 @@ set( inc/azure/perf/program.hpp inc/azure/perf/random_stream.hpp inc/azure/perf/test_metadata.hpp - inc/azure/perf/test.hpp inc/azure/perf/test_options.hpp + inc/azure/perf/test.hpp ) set( diff --git a/sdk/core/perf/test/CMakeLists.txt b/sdk/core/perf/test/CMakeLists.txt index 8795d1c4a2..d6953fc8bf 100644 --- a/sdk/core/perf/test/CMakeLists.txt +++ b/sdk/core/perf/test/CMakeLists.txt @@ -14,6 +14,7 @@ set( inc/azure/perf/test/exception_test.hpp inc/azure/perf/test/extended_options_test.hpp inc/azure/perf/test/http_client_get_test.hpp + inc/azure/perf/test/http_pipeline_get_test.hpp inc/azure/perf/test/no_op_test.hpp inc/azure/perf/test/win_http_client_get_test.hpp ) @@ -21,6 +22,7 @@ set( set( AZURE_PERF_TEST_SOURCE src/perf_test.cpp + src/random_stream_test.cpp ) # Name the binary to be created. diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt index f776b3a94a..335ce8b943 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt @@ -58,11 +58,14 @@ endif() set( AZURE_MESSAGING_EVENTHUBS_BLOB_CHECKPOINT_HEADER inc/azure/messaging/eventhubs/checkpointstore_blob/blob_checkpoint_store.hpp + inc/azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp + inc/azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp ) set( AZURE_MESSAGING_EVENTHUBS_BLOB_CHECKPOINT_SOURCE src/blob_checkpoint_store.cpp + src/private/package_version.hpp ) add_library( diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt index 5674093801..32b85453a9 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt @@ -18,6 +18,7 @@ SetUpTestProxy("sdk/eventhubs") add_executable ( azure-messaging-eventhubs-blobstore-test blob_checkpoint_store_test.cpp + eventhubs_test_base.hpp ) create_per_service_target_build(eventhubs azure-messaging-eventhubs-blobstore-test) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt index ce848460bb..e56f2ce64e 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt @@ -59,6 +59,11 @@ set( inc/azure/messaging/eventhubs/dll_import_export.hpp inc/azure/messaging/eventhubs/event_data_batch.hpp inc/azure/messaging/eventhubs/eventhubs_exception.hpp + inc/azure/messaging/eventhubs/partition_client.hpp + inc/azure/messaging/eventhubs/processor_partition_client.hpp + inc/azure/messaging/eventhubs/processor.hpp + inc/azure/messaging/eventhubs/producer_client.hpp + inc/azure/messaging/eventhubs/rtti.hpp inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp inc/azure/messaging/eventhubs/models/consumer_client_models.hpp inc/azure/messaging/eventhubs/models/event_data.hpp @@ -66,30 +71,27 @@ set( inc/azure/messaging/eventhubs/models/partition_client_models.hpp inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp inc/azure/messaging/eventhubs/models/processor_models.hpp - inc/azure/messaging/eventhubs/partition_client.hpp - inc/azure/messaging/eventhubs/processor.hpp - inc/azure/messaging/eventhubs/processor_partition_client.hpp - inc/azure/messaging/eventhubs/producer_client.hpp - inc/azure/messaging/eventhubs/rtti.hpp ) set( AZURE_MESSAGING_EVENTHUBS_SOURCE src/checkpoint_store.cpp src/consumer_client.cpp - src/event_data.cpp src/event_data_batch.cpp - src/partition_client.cpp + src/event_data.cpp + src/eventhubs_utilities.cpp src/partition_client_models.cpp - src/private/package_version.hpp - src/private/eventhubs_constants.hpp - src/private/eventhubs_utilities.hpp - src/processor.cpp + src/partition_client.cpp src/processor_load_balancer.cpp src/processor_partition_client.cpp + src/processor.cpp src/producer_client.cpp src/retry_operation.cpp - src/eventhubs_utilities.cpp + src/private/eventhubs_constants.hpp + src/private/eventhubs_utilities.hpp + src/private/package_version.hpp + src/private/processor_load_balancer.hpp + src/private/retry_operation.hpp ) add_library( diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt index 1d0b1a6355..c9a856c2f8 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs/test/ut/CMakeLists.txt @@ -17,17 +17,19 @@ SetUpTestProxy("sdk/eventhubs") ################## Unit Tests ########################## add_executable ( azure-messaging-eventhubs-test - test_checkpoint_store.hpp - round_trip_test.cpp - retry_operation_test.cpp - producer_client_test.cpp - processor_test.cpp - processor_load_balancer_test.cpp + checkpoint_store_test.cpp + consumer_client_test.cpp + event_data_test.cpp eventhubs_admin_client_test.cpp eventhubs_admin_client.cpp - event_data_test.cpp - consumer_client_test.cpp - checkpoint_store_test.cpp + eventhubs_admin_client.hpp + eventhubs_test_base.hpp + processor_load_balancer_test.cpp + processor_test.cpp + producer_client_test.cpp + retry_operation_test.cpp + round_trip_test.cpp + test_checkpoint_store.hpp ) create_per_service_target_build(eventhubs azure-messaging-eventhubs-test) diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt index e054973ee1..db9c3bd483 100644 --- a/sdk/identity/azure-identity/CMakeLists.txt +++ b/sdk/identity/azure-identity/CMakeLists.txt @@ -46,8 +46,7 @@ endif() set( AZURE_IDENTITY_HEADER - inc/azure/identity/detail/client_credential_core.hpp - inc/azure/identity/detail/token_cache.hpp + inc/azure/identity.hpp inc/azure/identity/azure_cli_credential.hpp inc/azure/identity/chained_token_credential.hpp inc/azure/identity/client_certificate_credential.hpp @@ -58,17 +57,12 @@ set( inc/azure/identity/managed_identity_credential.hpp inc/azure/identity/rtti.hpp inc/azure/identity/workload_identity_credential.hpp - inc/azure/identity.hpp + inc/azure/identity/detail/client_credential_core.hpp + inc/azure/identity/detail/token_cache.hpp ) set( AZURE_IDENTITY_SOURCE - src/private/chained_token_credential_impl.hpp - src/private/identity_log.hpp - src/private/managed_identity_source.hpp - src/private/package_version.hpp - src/private/tenant_id_resolver.hpp - src/private/token_credential_impl.hpp src/azure_cli_credential.cpp src/chained_token_credential.cpp src/client_certificate_credential.cpp @@ -82,6 +76,12 @@ set( src/token_cache.cpp src/token_credential_impl.cpp src/workload_identity_credential.cpp + src/private/chained_token_credential_impl.hpp + src/private/identity_log.hpp + src/private/managed_identity_source.hpp + src/private/package_version.hpp + src/private/tenant_id_resolver.hpp + src/private/token_credential_impl.hpp ) add_library(azure-identity ${AZURE_IDENTITY_HEADER} ${AZURE_IDENTITY_SOURCE}) diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt index 584fbde132..043ecea047 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt @@ -51,16 +51,17 @@ set( inc/azure/keyvault/administration/dll_import_export.hpp inc/azure/keyvault/administration/rest_client_models.hpp inc/azure/keyvault/administration/rtti.hpp - inc/azure/keyvault/administration/settings_client.hpp inc/azure/keyvault/administration/settings_client_options.hpp - src/private/keyvault_settings_common_request.hpp - src/private/administration_constants.hpp + inc/azure/keyvault/administration/settings_client.hpp ) set( AZURE_SECURITY_KEYVAULT_ADMINISTRATION_SOURCE src/keyvault_settings_common_request.cpp src/settings_client.cpp + src/private/administration_constants.hpp + src/private/keyvault_settings_common_request.hpp + src/private/package_version.hpp ) add_library(azure-security-keyvault-administration ${AZURE_SECURITY_KEYVAULT_ADMINISTRATION_HEADER} ${AZURE_SECURITY_KEYVAULT_ADMINISTRATION_SOURCE}) diff --git a/sdk/keyvault/azure-security-keyvault-administration/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/test/ut/CMakeLists.txt index 5aa6613d99..188dc1c707 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/test/ut/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-administration/test/ut/CMakeLists.txt @@ -18,8 +18,9 @@ add_compile_definitions(AZURE_TEST_RECORDING_DIR="${CMAKE_CURRENT_LIST_DIR}") add_executable ( azure-security-keyvault-administration-test macro_guard.cpp + settings_client_base_test.hpp settings_client_test.cpp - settings_client_base_test.hpp) +) create_per_service_target_build(keyvault azure-security-keyvault-administration-test) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt index 16171abc06..ad01a016c7 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt @@ -48,26 +48,27 @@ endif() set( AZURE_KEYVAULT_CERTIFICATES_HEADER - inc/azure/keyvault/certificates/certificate_client.hpp + inc/azure/keyvault/certificates.hpp inc/azure/keyvault/certificates/certificate_client_models.hpp - inc/azure/keyvault/certificates/certificate_client_options.hpp inc/azure/keyvault/certificates/certificate_client_operations.hpp + inc/azure/keyvault/certificates/certificate_client_options.hpp + inc/azure/keyvault/certificates/certificate_client.hpp inc/azure/keyvault/certificates/dll_import_export.hpp inc/azure/keyvault/certificates/rtti.hpp ) set( AZURE_KEYVAULT_CERTIFICATES_SOURCE + src/certificate_client_operations.cpp + src/certificate_client_paged_response.cpp + src/certificate_client.cpp + src/certificate_serializers.cpp + src/keyvault_certificates_common_request.cpp src/private/certificate_constants.hpp src/private/certificate_key_usage.hpp src/private/certificate_serializers.hpp src/private/keyvault_certificates_common_request.hpp src/private/package_version.hpp - src/certificate_client.cpp - src/certificate_client_operations.cpp - src/certificate_client_paged_response.cpp - src/certificate_serializers.cpp - src/keyvault_certificates_common_request.cpp ) add_library(azure-security-keyvault-certificates diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt index ea7684257c..aab991601e 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt @@ -17,9 +17,10 @@ SetUpTestProxy("sdk/keyvault") add_executable ( azure-security-keyvault-certificates-test - macro_guard.cpp + certificate_client_base_test.hpp certificate_client_test.cpp - certificate_client_base_test.hpp) + macro_guard.cpp +) create_per_service_target_build(keyvault azure-security-keyvault-certificates-test) diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt index 6c37510b78..2c7c9b23fd 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt @@ -47,20 +47,39 @@ endif() set( AZURE_KEYVAULT_KEYS_HEADER - inc/azure/keyvault/keys/cryptography/cryptography_client.hpp - inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp - inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp + inc/azure/keyvault/keys.hpp + inc/azure/keyvault/keyvault_keys.hpp inc/azure/keyvault/keys/dll_import_export.hpp - inc/azure/keyvault/keys/key_client.hpp inc/azure/keyvault/keys/key_client_models.hpp inc/azure/keyvault/keys/key_client_options.hpp + inc/azure/keyvault/keys/key_client.hpp inc/azure/keyvault/keys/rtti.hpp - inc/azure/keyvault/keys.hpp - inc/azure/keyvault/keyvault_keys.hpp + inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp + inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp + inc/azure/keyvault/keys/cryptography/cryptography_client.hpp ) set( AZURE_KEYVAULT_KEYS_SOURCE + src/delete_key_operation.cpp + src/deleted_key.cpp + src/import_key_options.cpp + src/json_web_key.cpp + src/key_backup.cpp + src/key_client_paged_responses.cpp + src/key_client.cpp + src/key_curve_name.cpp + src/key_encryption_algorithm.cpp + src/key_get_random_bytes.cpp + src/key_operation.cpp + src/key_release_options.cpp + src/key_release_policy.cpp + src/key_request_parameters.cpp + src/key_rotation_policy.cpp + src/key_type.cpp + src/keyvault_key.cpp + src/keyvault_protocol.cpp + src/recover_deleted_key_operation.cpp src/cryptography/cryptography_client.cpp src/cryptography/decrypt_parameters.cpp src/cryptography/decrypt_result.cpp @@ -88,25 +107,6 @@ set( src/private/keyvault_constants.hpp src/private/keyvault_protocol.hpp src/private/package_version.hpp - src/delete_key_operation.cpp - src/deleted_key.cpp - src/import_key_options.cpp - src/json_web_key.cpp - src/key_backup.cpp - src/key_client.cpp - src/key_client_paged_responses.cpp - src/key_curve_name.cpp - src/key_operation.cpp - src/key_release_options.cpp - src/key_release_policy.cpp - src/key_request_parameters.cpp - src/key_encryption_algorithm.cpp - src/key_type.cpp - src/keyvault_key.cpp - src/keyvault_protocol.cpp - src/recover_deleted_key_operation.cpp - src/key_rotation_policy.cpp - src/key_get_random_bytes.cpp ) add_library(azure-security-keyvault-keys diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/CMakeLists.txt index 659d3ad4c6..8cabc905b6 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/CMakeLists.txt @@ -17,10 +17,9 @@ SetUpTestProxy("sdk/keyvault") ################## Unit Tests ########################## add_executable ( azure-security-keyvault-keys-hsm-test - key_client_test_hsm_live.hpp key_client_test_hsm_live.cpp - ) +) create_per_service_target_build(keyvault azure-security-keyvault-keys-hsm-test) create_map_file(azure-security-keyvault-keys-hsm-test azure-security-keyvault-keys-hsm-test.map) diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt index fd7e4d5ea3..8db4121b16 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt @@ -17,7 +17,6 @@ SetUpTestProxy("sdk/keyvault") ################## Unit Tests ########################## add_executable ( azure-security-keyvault-keys-test - key_client_backup_test_live.cpp key_client_base_test.hpp key_client_create_test_live.cpp @@ -32,7 +31,7 @@ add_executable ( mocked_client_test.cpp mocked_transport_adapter_test.hpp test_consts.hpp - ) +) create_per_service_target_build(keyvault azure-security-keyvault-keys-test) create_map_file(azure-security-keyvault-keys-test azure-security-keyvault-keys-test.map) diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt index d95b3fbfc0..1db4aa0270 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt @@ -47,26 +47,21 @@ endif() set( AZURE_SECURITY_KEYVAULT_SECRETS_HEADER + inc/azure/keyvault/secrets.hpp inc/azure/keyvault/secrets/dll_import_export.hpp inc/azure/keyvault/secrets/keyvault_backup_secret.hpp inc/azure/keyvault/secrets/keyvault_deleted_secret.hpp inc/azure/keyvault/secrets/keyvault_operations.hpp inc/azure/keyvault/secrets/keyvault_options.hpp - inc/azure/keyvault/secrets/keyvault_secret.hpp inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp inc/azure/keyvault/secrets/keyvault_secret_properties.hpp + inc/azure/keyvault/secrets/keyvault_secret.hpp inc/azure/keyvault/secrets/rtti.hpp inc/azure/keyvault/secrets/secret_client.hpp - inc/azure/keyvault/secrets.hpp ) set( AZURE_SECURITY_KEYVAULT_SECRETS_SOURCE - src/private/keyvault_protocol.hpp - src/private/keyvault_secrets_common_request.hpp - src/private/package_version.hpp - src/private/secret_constants.hpp - src/private/secret_serializers.hpp src/keyvault_operations.cpp src/keyvault_protocol.cpp src/keyvault_secret_paged_response.cpp @@ -74,6 +69,11 @@ set( src/keyvault_secrets_common_request.cpp src/secret_client.cpp src/secret_serializers.cpp + src/private/keyvault_protocol.hpp + src/private/keyvault_secrets_common_request.hpp + src/private/package_version.hpp + src/private/secret_constants.hpp + src/private/secret_serializers.hpp ) add_library(azure-security-keyvault-secrets ${AZURE_SECURITY_KEYVAULT_SECRETS_HEADER} ${AZURE_SECURITY_KEYVAULT_SECRETS_SOURCE}) diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt index afd9ce4dc2..1d9ac0a248 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt @@ -18,16 +18,17 @@ add_executable ( azure-security-keyvault-secrets-test challenge_based_authentication_policy_test.cpp macro_guard.cpp - secret_client_test.cpp - secret_get_client_deserialize_test.hpp - secret_get_client_deserialize_test.cpp - secret_set_parameters_serializer_test.cpp - secret_update_properties_test.cpp secret_backup_deserialize_test.cpp secret_backup_deserialize_test.hpp + secret_client_base_test.hpp + secret_client_test.cpp + secret_get_client_deserialize_test.cpp + secret_get_client_deserialize_test.hpp secret_paged_deserialize_test.cpp secret_paged_deserialize_test.hpp - secret_client_base_test.hpp) + secret_set_parameters_serializer_test.cpp + secret_update_properties_test.cpp +) create_per_service_target_build(keyvault azure-security-keyvault-secrets-test) create_map_file(azure-security-keyvault-secrets-test azure-security-keyvault-secrets-test.map) diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt index c64a343eff..49edebb6ee 100644 --- a/sdk/storage/azure-storage-blobs/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt @@ -41,6 +41,7 @@ endif() set( AZURE_STORAGE_BLOBS_HEADER + inc/azure/storage/blobs.hpp inc/azure/storage/blobs/append_blob_client.hpp inc/azure/storage/blobs/blob_batch.hpp inc/azure/storage/blobs/blob_client.hpp @@ -56,9 +57,6 @@ set( inc/azure/storage/blobs/page_blob_client.hpp inc/azure/storage/blobs/rest_client.hpp inc/azure/storage/blobs/rtti.hpp - inc/azure/storage/blobs.hpp - src/private/avro_parser.hpp - src/private/package_version.hpp ) set( @@ -74,8 +72,10 @@ set( src/blob_service_client.cpp src/block_blob_client.cpp src/page_blob_client.cpp - src/private/avro_parser.cpp src/rest_client.cpp + src/private/avro_parser.cpp + src/private/avro_parser.hpp + src/private/package_version.hpp ) add_library(azure-storage-blobs ${AZURE_STORAGE_BLOBS_HEADER} ${AZURE_STORAGE_BLOBS_SOURCE}) diff --git a/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt b/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt index 22fbf507a3..42dc62e253 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt @@ -24,8 +24,8 @@ add_executable ( blob_container_client_test.hpp blob_query_test.cpp blob_sas_test.cpp - blob_service_client_test.hpp blob_service_client_test.cpp + blob_service_client_test.hpp block_blob_client_test.cpp block_blob_client_test.hpp connection_reuse_test.cpp @@ -34,7 +34,7 @@ add_executable ( page_blob_client_test.hpp simplified_header_test.cpp storage_retry_policy_test.cpp - storage_timeout_test.cpp + storage_timeout_test.cpp # Include shared test source code ${CMAKE_CURRENT_SOURCE_DIR}/../../../azure-storage-common/test/ut/test_base.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../../azure-storage-common/test/ut/test_base.hpp diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt index 72be52c6e7..4a86f9fb63 100644 --- a/sdk/storage/azure-storage-common/CMakeLists.txt +++ b/sdk/storage/azure-storage-common/CMakeLists.txt @@ -47,6 +47,10 @@ set( inc/azure/storage/common/account_sas_builder.hpp inc/azure/storage/common/crypt.hpp inc/azure/storage/common/dll_import_export.hpp + inc/azure/storage/common/rtti.hpp + inc/azure/storage/common/storage_common.hpp + inc/azure/storage/common/storage_credential.hpp + inc/azure/storage/common/storage_exception.hpp inc/azure/storage/common/internal/concurrent_transfer.hpp inc/azure/storage/common/internal/constants.hpp inc/azure/storage/common/internal/file_io.hpp @@ -58,15 +62,10 @@ set( inc/azure/storage/common/internal/storage_service_version_policy.hpp inc/azure/storage/common/internal/storage_switch_to_secondary_policy.hpp inc/azure/storage/common/internal/xml_wrapper.hpp - inc/azure/storage/common/rtti.hpp - inc/azure/storage/common/storage_common.hpp - inc/azure/storage/common/storage_credential.hpp - inc/azure/storage/common/storage_exception.hpp ) set( AZURE_STORAGE_COMMON_SOURCE - src/private/package_version.hpp src/account_sas_builder.cpp src/crypt.cpp src/file_io.cpp @@ -78,6 +77,7 @@ set( src/storage_per_retry_policy.cpp src/storage_switch_to_secondary_policy.cpp src/xml_wrapper.cpp + src/private/package_version.hpp ) add_library(azure-storage-common ${AZURE_STORAGE_COMMON_HEADER} ${AZURE_STORAGE_COMMON_SOURCE}) diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt index d956c0671b..9a45576b37 100644 --- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt @@ -58,9 +58,6 @@ set( set( AZURE_STORAGE_FILES_DATALAKE_SOURCE - src/private/datalake_constants.hpp - src/private/datalake_utilities.hpp - src/private/package_version.hpp src/datalake_directory_client.cpp src/datalake_file_client.cpp src/datalake_file_system_client.cpp @@ -72,6 +69,9 @@ set( src/datalake_service_client.cpp src/datalake_utilities.cpp src/rest_client.cpp + src/private/datalake_constants.hpp + src/private/datalake_utilities.hpp + src/private/package_version.hpp ) add_library(azure-storage-files-datalake ${AZURE_STORAGE_FILES_DATALAKE_HEADER} ${AZURE_STORAGE_FILES_DATALAKE_SOURCE}) diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt index 33071a9c03..f3c577ffe3 100644 --- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt @@ -41,6 +41,7 @@ endif() set( AZURE_STORAGE_FILES_SHARES_HEADER + inc/azure/storage/files/shares.hpp inc/azure/storage/files/shares/dll_import_export.hpp inc/azure/storage/files/shares/rest_client.hpp inc/azure/storage/files/shares/rtti.hpp @@ -53,12 +54,10 @@ set( inc/azure/storage/files/shares/share_responses.hpp inc/azure/storage/files/shares/share_sas_builder.hpp inc/azure/storage/files/shares/share_service_client.hpp - inc/azure/storage/files/shares.hpp ) set( AZURE_STORAGE_FILES_SHARES_SOURCE - src/private/package_version.hpp src/rest_client.cpp src/share_client.cpp src/share_directory_client.cpp @@ -68,6 +67,7 @@ set( src/share_responses.cpp src/share_sas_builder.cpp src/share_service_client.cpp + src/private/package_version.hpp ) add_library(azure-storage-files-shares ${AZURE_STORAGE_FILES_SHARES_HEADER} ${AZURE_STORAGE_FILES_SHARES_SOURCE}) diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt index 1239d6b14c..7a0f345562 100644 --- a/sdk/storage/azure-storage-queues/CMakeLists.txt +++ b/sdk/storage/azure-storage-queues/CMakeLists.txt @@ -54,13 +54,13 @@ set( set( AZURE_STORAGE_QUEUES_SOURCE - src/private/package_version.hpp src/queue_client.cpp src/queue_options.cpp src/queue_responses.cpp src/queue_sas_builder.cpp src/queue_service_client.cpp src/rest_client.cpp + src/private/package_version.hpp ) add_library(azure-storage-queues ${AZURE_STORAGE_QUEUES_HEADER} ${AZURE_STORAGE_QUEUES_SOURCE}) diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt index 1558ec8b5f..2428da7f74 100644 --- a/sdk/template/azure-template/CMakeLists.txt +++ b/sdk/template/azure-template/CMakeLists.txt @@ -41,15 +41,16 @@ endif() set( AZURE_TEMPLATE_HEADER + inc/azure/template.hpp inc/azure/template/dll_import_export.hpp + inc/azure/template/rtti.hpp inc/azure/template/template_client.hpp - inc/azure/template.hpp ) set( AZURE_TEMPLATE_SOURCE - src/private/package_version.hpp src/template_client.cpp + src/private/package_version.hpp ) add_library(azure-template ${AZURE_TEMPLATE_HEADER} ${AZURE_TEMPLATE_SOURCE}) From 8a6086eddb86d2602ef2bde98c61485d0a31eff0 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 25 Oct 2023 20:27:08 -0700 Subject: [PATCH 2/4] CI fixes --- sdk/core/azure-core/test/ut/CMakeLists.txt | 2 -- sdk/core/perf/test/CMakeLists.txt | 1 - 2 files changed, 3 deletions(-) diff --git a/sdk/core/azure-core/test/ut/CMakeLists.txt b/sdk/core/azure-core/test/ut/CMakeLists.txt index 3231937292..83e45960a6 100644 --- a/sdk/core/azure-core/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core/test/ut/CMakeLists.txt @@ -28,7 +28,6 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED True) if(BUILD_TRANSPORT_CURL) - SET(CURL_AZURE_CORE_MAIN_TEST azure_libcurl_core_main_test.cpp) SET(CURL_OPTIONS_TESTS curl_options_test.cpp) SET(CURL_SESSION_TESTS curl_session_test_test.cpp curl_session_test.hpp) SET(CURL_CONNECTION_POOL_TESTS curl_connection_pool_test.cpp) @@ -47,7 +46,6 @@ endif() add_executable ( azure-core-test - ${CURL_AZURE_CORE_MAIN_TEST} ${CURL_CONNECTION_POOL_TESTS} ${CURL_OPTIONS_TESTS} ${CURL_SESSION_TESTS} diff --git a/sdk/core/perf/test/CMakeLists.txt b/sdk/core/perf/test/CMakeLists.txt index d6953fc8bf..723ced2c9d 100644 --- a/sdk/core/perf/test/CMakeLists.txt +++ b/sdk/core/perf/test/CMakeLists.txt @@ -22,7 +22,6 @@ set( set( AZURE_PERF_TEST_SOURCE src/perf_test.cpp - src/random_stream_test.cpp ) # Name the binary to be created. From b95b8bf309a898b0cf72f420eda612939f0c0b06 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 25 Oct 2023 23:30:54 -0700 Subject: [PATCH 3/4] Alphabetical string ordering --- .../azure-security-attestation/CMakeLists.txt | 10 +-- .../test/ut/CMakeLists.txt | 2 +- sdk/core/azure-core-amqp/CMakeLists.txt | 6 +- sdk/core/azure-core-test/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +- sdk/core/azure-core/CMakeLists.txt | 62 +++++++++---------- .../azure-messaging-eventhubs/CMakeLists.txt | 24 +++---- sdk/identity/azure-identity/CMakeLists.txt | 12 ++-- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 44 ++++++------- .../CMakeLists.txt | 6 +- .../azure-storage-blobs/CMakeLists.txt | 2 +- .../azure-storage-common/CMakeLists.txt | 10 +-- .../CMakeLists.txt | 2 +- .../azure-storage-files-shares/CMakeLists.txt | 2 +- .../azure-storage-queues/CMakeLists.txt | 2 +- sdk/template/azure-template/CMakeLists.txt | 2 +- 18 files changed, 100 insertions(+), 100 deletions(-) diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt index bc6f48f877..ee9077cc74 100644 --- a/sdk/attestation/azure-security-attestation/CMakeLists.txt +++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt @@ -33,9 +33,9 @@ set( AZURE_ATTESTATION_HEADER inc/azure/attestation.hpp inc/azure/attestation/attestation_administration_client.hpp + inc/azure/attestation/attestation_client.hpp inc/azure/attestation/attestation_client_models.hpp inc/azure/attestation/attestation_client_options.hpp - inc/azure/attestation/attestation_client.hpp inc/azure/attestation/dll_import_export.hpp inc/azure/attestation/rtti.hpp ) @@ -43,8 +43,8 @@ set( set( AZURE_ATTESTATION_SOURCE src/attestation_administration_client.cpp - src/attestation_client_options.cpp src/attestation_client.cpp + src/attestation_client_options.cpp src/private/attestation_client_models_private.hpp src/private/attestation_client_private.cpp src/private/attestation_client_private.hpp @@ -52,9 +52,6 @@ set( src/private/attestation_common_request.hpp src/private/attestation_deserializers_private.cpp src/private/attestation_deserializers_private.hpp - src/private/jsonhelpers_private.hpp - src/private/jsonhelpers.cpp - src/private/package_version.hpp src/private/crypto/inc/crypto.hpp src/private/crypto/openssl/openssl_helpers.hpp src/private/crypto/openssl/opensslcert.cpp @@ -62,6 +59,9 @@ set( src/private/crypto/openssl/opensslcrypto.cpp src/private/crypto/openssl/opensslkeys.cpp src/private/crypto/openssl/opensslkeys.hpp + src/private/jsonhelpers.cpp + src/private/jsonhelpers_private.hpp + src/private/package_version.hpp ) add_library(azure-security-attestation ${AZURE_ATTESTATION_HEADER} ${AZURE_ATTESTATION_SOURCE}) diff --git a/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt b/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt index 8a5f61d8d9..328e17d7b1 100644 --- a/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt +++ b/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt @@ -27,9 +27,9 @@ add_executable ( attestation_collateral.cpp attestation_metadata.cpp attestation_test.cpp + crypto_test.cpp crypto_test_collateral.cpp crypto_test_collateral.hpp - crypto_test.cpp macro_guard.cpp policycertmgmt_test.cpp policygetset_test.cpp diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt index 7fc29f5035..b10108d7d2 100644 --- a/sdk/core/azure-core-amqp/CMakeLists.txt +++ b/sdk/core/azure-core-amqp/CMakeLists.txt @@ -93,13 +93,12 @@ set (AZURE_CORE_AMQP_HEADER set(AZURE_CORE_AMQP_SOURCE src/amqp/cancellable.cpp src/amqp/claim_based_security.cpp - src/amqp/connection_string_credential.cpp src/amqp/connection.cpp + src/amqp/connection_string_credential.cpp src/amqp/link.cpp src/amqp/management.cpp src/amqp/message_receiver.cpp src/amqp/message_sender.cpp - src/amqp/session.cpp src/amqp/private/claims_based_security_impl.hpp src/amqp/private/connection_impl.hpp src/amqp/private/link_impl.hpp @@ -107,6 +106,7 @@ set(AZURE_CORE_AMQP_SOURCE src/amqp/private/message_receiver_impl.hpp src/amqp/private/message_sender_impl.hpp src/amqp/private/session_impl.hpp + src/amqp/session.cpp src/common/global_state.cpp src/models/amqp_error.cpp src/models/amqp_header.cpp @@ -117,12 +117,12 @@ set(AZURE_CORE_AMQP_SOURCE src/models/message_target.cpp src/models/messaging_values.cpp src/network/amqp_header_transport.cpp + src/network/private/transport_impl.hpp src/network/sasl_transport.cpp src/network/socket_listener.cpp src/network/socket_transport.cpp src/network/tls_transport.cpp src/network/transport.cpp - src/network/private/transport_impl.hpp src/private/package_version.hpp ) diff --git a/sdk/core/azure-core-test/CMakeLists.txt b/sdk/core/azure-core-test/CMakeLists.txt index c52e2dddf9..6628e21c9a 100644 --- a/sdk/core/azure-core-test/CMakeLists.txt +++ b/sdk/core/azure-core-test/CMakeLists.txt @@ -19,10 +19,10 @@ set( set( AZURE_CORE_TEST_SOURCE + src/private/package_version.hpp src/test_base.cpp src/test_proxy_manager.cpp src/test_proxy_policy.cpp - src/private/package_version.hpp ) add_library ( diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt index 5b1ab5e589..85aa4f5f36 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt @@ -41,15 +41,15 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) set( AZURE_CORE_OPENTELEMETRY_HEADER inc/azure/core/tracing/opentelemetry/dll_import_export.hpp + inc/azure/core/tracing/opentelemetry/internal/apiview.hpp inc/azure/core/tracing/opentelemetry/opentelemetry.hpp inc/azure/core/tracing/opentelemetry/rtti.hpp - inc/azure/core/tracing/opentelemetry/internal/apiview.hpp ) set( AZURE_CORE_OPENTELEMETRY_SOURCE - src/opentelemetry_private.hpp src/opentelemetry.cpp + src/opentelemetry_private.hpp src/private/package_version.hpp ) diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt index d62e62c1d3..24fff39154 100644 --- a/sdk/core/azure-core/CMakeLists.txt +++ b/sdk/core/azure-core/CMakeLists.txt @@ -67,51 +67,51 @@ set( inc/azure/core/base64.hpp inc/azure/core/case_insensitive_containers.hpp inc/azure/core/context.hpp - inc/azure/core/datetime.hpp - inc/azure/core/dll_import_export.hpp - inc/azure/core/etag.hpp - inc/azure/core/exception.hpp - inc/azure/core/match_conditions.hpp - inc/azure/core/modified_conditions.hpp - inc/azure/core/nullable.hpp - inc/azure/core/operation_status.hpp - inc/azure/core/operation.hpp - inc/azure/core/paged_response.hpp - inc/azure/core/platform.hpp - inc/azure/core/response.hpp - inc/azure/core/rtti.hpp - inc/azure/core/url.hpp - inc/azure/core/uuid.hpp inc/azure/core/credentials/credentials.hpp inc/azure/core/credentials/token_credential_options.hpp inc/azure/core/cryptography/hash.hpp + inc/azure/core/datetime.hpp inc/azure/core/diagnostics/logger.hpp - inc/azure/core/http/http_status_code.hpp + inc/azure/core/dll_import_export.hpp + inc/azure/core/etag.hpp + inc/azure/core/exception.hpp inc/azure/core/http/http.hpp + inc/azure/core/http/http_status_code.hpp + inc/azure/core/http/policies/policy.hpp inc/azure/core/http/raw_response.hpp inc/azure/core/http/transport.hpp - inc/azure/core/http/policies/policy.hpp inc/azure/core/internal/client_options.hpp inc/azure/core/internal/contract.hpp - inc/azure/core/internal/environment.hpp - inc/azure/core/internal/extendable_enumeration.hpp - inc/azure/core/internal/strings.hpp - inc/azure/core/internal/unique_handle.hpp inc/azure/core/internal/credentials/authorization_challenge_parser.hpp inc/azure/core/internal/cryptography/sha_hash.hpp inc/azure/core/internal/diagnostics/global_exception.hpp inc/azure/core/internal/diagnostics/log.hpp + inc/azure/core/internal/environment.hpp + inc/azure/core/internal/extendable_enumeration.hpp inc/azure/core/internal/http/http_sanitizer.hpp inc/azure/core/internal/http/pipeline.hpp inc/azure/core/internal/http/user_agent.hpp inc/azure/core/internal/io/null_body_stream.hpp + inc/azure/core/internal/json/json.hpp inc/azure/core/internal/json/json_optional.hpp inc/azure/core/internal/json/json_serializable.hpp - inc/azure/core/internal/json/json.hpp + inc/azure/core/internal/strings.hpp inc/azure/core/internal/tracing/service_tracing.hpp inc/azure/core/internal/tracing/tracing_impl.hpp + inc/azure/core/internal/unique_handle.hpp inc/azure/core/io/body_stream.hpp + inc/azure/core/match_conditions.hpp + inc/azure/core/modified_conditions.hpp + inc/azure/core/nullable.hpp + inc/azure/core/operation.hpp + inc/azure/core/operation_status.hpp + inc/azure/core/paged_response.hpp + inc/azure/core/platform.hpp + inc/azure/core/response.hpp + inc/azure/core/rtti.hpp inc/azure/core/tracing/tracing.hpp + inc/azure/core/url.hpp + inc/azure/core/uuid.hpp ) set( @@ -121,25 +121,22 @@ set( src/azure_assert.cpp src/base64.cpp src/context.cpp + src/credentials/authorization_challenge_parser.cpp + src/cryptography/md5.cpp + src/cryptography/sha_hash.cpp src/datetime.cpp - src/environment_log_level_listener.cpp src/environment.cpp + src/environment_log_level_listener.cpp src/etag.cpp src/exception.cpp - src/logger.cpp - src/operation_status.cpp - src/uuid.cpp - src/credentials/authorization_challenge_parser.cpp - src/cryptography/md5.cpp - src/cryptography/sha_hash.cpp src/http/bearer_token_authentication_policy.cpp - src/http/http_sanitizer.cpp src/http/http.cpp + src/http/http_sanitizer.cpp src/http/log_policy.cpp src/http/policy.cpp src/http/raw_response.cpp - src/http/request_activity_policy.cpp src/http/request.cpp + src/http/request_activity_policy.cpp src/http/retry_policy.cpp src/http/telemetry_policy.cpp src/http/transport_policy.cpp @@ -147,9 +144,12 @@ set( src/http/user_agent.cpp src/io/body_stream.cpp src/io/random_access_file_body_stream.cpp + src/logger.cpp + src/operation_status.cpp src/private/environment_log_level_listener.hpp src/private/package_version.hpp src/tracing/tracing.cpp + src/uuid.cpp ) add_library(azure-core ${AZURE_CORE_HEADER} ${AZURE_CORE_SOURCE}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt index e56f2ce64e..5b69cf55c3 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt @@ -59,11 +59,6 @@ set( inc/azure/messaging/eventhubs/dll_import_export.hpp inc/azure/messaging/eventhubs/event_data_batch.hpp inc/azure/messaging/eventhubs/eventhubs_exception.hpp - inc/azure/messaging/eventhubs/partition_client.hpp - inc/azure/messaging/eventhubs/processor_partition_client.hpp - inc/azure/messaging/eventhubs/processor.hpp - inc/azure/messaging/eventhubs/producer_client.hpp - inc/azure/messaging/eventhubs/rtti.hpp inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp inc/azure/messaging/eventhubs/models/consumer_client_models.hpp inc/azure/messaging/eventhubs/models/event_data.hpp @@ -71,27 +66,32 @@ set( inc/azure/messaging/eventhubs/models/partition_client_models.hpp inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp inc/azure/messaging/eventhubs/models/processor_models.hpp + inc/azure/messaging/eventhubs/partition_client.hpp + inc/azure/messaging/eventhubs/processor.hpp + inc/azure/messaging/eventhubs/processor_partition_client.hpp + inc/azure/messaging/eventhubs/producer_client.hpp + inc/azure/messaging/eventhubs/rtti.hpp ) set( AZURE_MESSAGING_EVENTHUBS_SOURCE src/checkpoint_store.cpp src/consumer_client.cpp - src/event_data_batch.cpp src/event_data.cpp + src/event_data_batch.cpp src/eventhubs_utilities.cpp - src/partition_client_models.cpp src/partition_client.cpp - src/processor_load_balancer.cpp - src/processor_partition_client.cpp - src/processor.cpp - src/producer_client.cpp - src/retry_operation.cpp + src/partition_client_models.cpp src/private/eventhubs_constants.hpp src/private/eventhubs_utilities.hpp src/private/package_version.hpp src/private/processor_load_balancer.hpp src/private/retry_operation.hpp + src/processor.cpp + src/processor_load_balancer.cpp + src/processor_partition_client.cpp + src/producer_client.cpp + src/retry_operation.cpp ) add_library( diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt index db9c3bd483..a53226b396 100644 --- a/sdk/identity/azure-identity/CMakeLists.txt +++ b/sdk/identity/azure-identity/CMakeLists.txt @@ -52,13 +52,13 @@ set( inc/azure/identity/client_certificate_credential.hpp inc/azure/identity/client_secret_credential.hpp inc/azure/identity/default_azure_credential.hpp + inc/azure/identity/detail/client_credential_core.hpp + inc/azure/identity/detail/token_cache.hpp inc/azure/identity/dll_import_export.hpp inc/azure/identity/environment_credential.hpp inc/azure/identity/managed_identity_credential.hpp inc/azure/identity/rtti.hpp inc/azure/identity/workload_identity_credential.hpp - inc/azure/identity/detail/client_credential_core.hpp - inc/azure/identity/detail/token_cache.hpp ) set( @@ -72,16 +72,16 @@ set( src/environment_credential.cpp src/managed_identity_credential.cpp src/managed_identity_source.cpp - src/tenant_id_resolver.cpp - src/token_cache.cpp - src/token_credential_impl.cpp - src/workload_identity_credential.cpp src/private/chained_token_credential_impl.hpp src/private/identity_log.hpp src/private/managed_identity_source.hpp src/private/package_version.hpp src/private/tenant_id_resolver.hpp src/private/token_credential_impl.hpp + src/tenant_id_resolver.cpp + src/token_cache.cpp + src/token_credential_impl.cpp + src/workload_identity_credential.cpp ) add_library(azure-identity ${AZURE_IDENTITY_HEADER} ${AZURE_IDENTITY_SOURCE}) diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt index 043ecea047..803327e4b4 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt @@ -51,17 +51,17 @@ set( inc/azure/keyvault/administration/dll_import_export.hpp inc/azure/keyvault/administration/rest_client_models.hpp inc/azure/keyvault/administration/rtti.hpp - inc/azure/keyvault/administration/settings_client_options.hpp inc/azure/keyvault/administration/settings_client.hpp + inc/azure/keyvault/administration/settings_client_options.hpp ) set( AZURE_SECURITY_KEYVAULT_ADMINISTRATION_SOURCE src/keyvault_settings_common_request.cpp - src/settings_client.cpp src/private/administration_constants.hpp src/private/keyvault_settings_common_request.hpp src/private/package_version.hpp + src/settings_client.cpp ) add_library(azure-security-keyvault-administration ${AZURE_SECURITY_KEYVAULT_ADMINISTRATION_HEADER} ${AZURE_SECURITY_KEYVAULT_ADMINISTRATION_SOURCE}) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt index ad01a016c7..084e41fb6b 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt @@ -49,19 +49,19 @@ endif() set( AZURE_KEYVAULT_CERTIFICATES_HEADER inc/azure/keyvault/certificates.hpp + inc/azure/keyvault/certificates/certificate_client.hpp inc/azure/keyvault/certificates/certificate_client_models.hpp inc/azure/keyvault/certificates/certificate_client_operations.hpp inc/azure/keyvault/certificates/certificate_client_options.hpp - inc/azure/keyvault/certificates/certificate_client.hpp inc/azure/keyvault/certificates/dll_import_export.hpp inc/azure/keyvault/certificates/rtti.hpp ) set( AZURE_KEYVAULT_CERTIFICATES_SOURCE + src/certificate_client.cpp src/certificate_client_operations.cpp src/certificate_client_paged_response.cpp - src/certificate_client.cpp src/certificate_serializers.cpp src/keyvault_certificates_common_request.cpp src/private/certificate_constants.hpp diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt index 2c7c9b23fd..18098c7573 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt @@ -48,26 +48,41 @@ endif() set( AZURE_KEYVAULT_KEYS_HEADER inc/azure/keyvault/keys.hpp - inc/azure/keyvault/keyvault_keys.hpp + inc/azure/keyvault/keys/cryptography/cryptography_client.hpp + inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp + inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp inc/azure/keyvault/keys/dll_import_export.hpp + inc/azure/keyvault/keys/key_client.hpp inc/azure/keyvault/keys/key_client_models.hpp inc/azure/keyvault/keys/key_client_options.hpp - inc/azure/keyvault/keys/key_client.hpp inc/azure/keyvault/keys/rtti.hpp - inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp - inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp - inc/azure/keyvault/keys/cryptography/cryptography_client.hpp + inc/azure/keyvault/keyvault_keys.hpp ) set( AZURE_KEYVAULT_KEYS_SOURCE + src/cryptography/cryptography_client.cpp + src/cryptography/decrypt_parameters.cpp + src/cryptography/decrypt_result.cpp + src/cryptography/encrypt_parameters.cpp + src/cryptography/encrypt_result.cpp + src/cryptography/encryption_algorithm.cpp + src/cryptography/key_sign_parameters.cpp + src/cryptography/key_verify_parameters.cpp + src/cryptography/key_wrap_algorithm.cpp + src/cryptography/key_wrap_parameters.cpp + src/cryptography/sign_result.cpp + src/cryptography/signature_algorithm.cpp + src/cryptography/unwrap_result.cpp + src/cryptography/verify_result.cpp + src/cryptography/wrap_result.cpp src/delete_key_operation.cpp src/deleted_key.cpp src/import_key_options.cpp src/json_web_key.cpp src/key_backup.cpp - src/key_client_paged_responses.cpp src/key_client.cpp + src/key_client_paged_responses.cpp src/key_curve_name.cpp src/key_encryption_algorithm.cpp src/key_get_random_bytes.cpp @@ -79,22 +94,6 @@ set( src/key_type.cpp src/keyvault_key.cpp src/keyvault_protocol.cpp - src/recover_deleted_key_operation.cpp - src/cryptography/cryptography_client.cpp - src/cryptography/decrypt_parameters.cpp - src/cryptography/decrypt_result.cpp - src/cryptography/encrypt_parameters.cpp - src/cryptography/encrypt_result.cpp - src/cryptography/encryption_algorithm.cpp - src/cryptography/key_sign_parameters.cpp - src/cryptography/key_verify_parameters.cpp - src/cryptography/key_wrap_algorithm.cpp - src/cryptography/key_wrap_parameters.cpp - src/cryptography/sign_result.cpp - src/cryptography/signature_algorithm.cpp - src/cryptography/unwrap_result.cpp - src/cryptography/verify_result.cpp - src/cryptography/wrap_result.cpp src/private/cryptography_internal_access.hpp src/private/cryptography_serializers.hpp src/private/key_backup.hpp @@ -107,6 +106,7 @@ set( src/private/keyvault_constants.hpp src/private/keyvault_protocol.hpp src/private/package_version.hpp + src/recover_deleted_key_operation.cpp ) add_library(azure-security-keyvault-keys diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt index 1db4aa0270..280208205a 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt @@ -53,9 +53,9 @@ set( inc/azure/keyvault/secrets/keyvault_deleted_secret.hpp inc/azure/keyvault/secrets/keyvault_operations.hpp inc/azure/keyvault/secrets/keyvault_options.hpp + inc/azure/keyvault/secrets/keyvault_secret.hpp inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp inc/azure/keyvault/secrets/keyvault_secret_properties.hpp - inc/azure/keyvault/secrets/keyvault_secret.hpp inc/azure/keyvault/secrets/rtti.hpp inc/azure/keyvault/secrets/secret_client.hpp ) @@ -67,13 +67,13 @@ set( src/keyvault_secret_paged_response.cpp src/keyvault_secret_properties.cpp src/keyvault_secrets_common_request.cpp - src/secret_client.cpp - src/secret_serializers.cpp src/private/keyvault_protocol.hpp src/private/keyvault_secrets_common_request.hpp src/private/package_version.hpp src/private/secret_constants.hpp src/private/secret_serializers.hpp + src/secret_client.cpp + src/secret_serializers.cpp ) add_library(azure-security-keyvault-secrets ${AZURE_SECURITY_KEYVAULT_SECRETS_HEADER} ${AZURE_SECURITY_KEYVAULT_SECRETS_SOURCE}) diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt index 49edebb6ee..7401ecce08 100644 --- a/sdk/storage/azure-storage-blobs/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt @@ -72,10 +72,10 @@ set( src/blob_service_client.cpp src/block_blob_client.cpp src/page_blob_client.cpp - src/rest_client.cpp src/private/avro_parser.cpp src/private/avro_parser.hpp src/private/package_version.hpp + src/rest_client.cpp ) add_library(azure-storage-blobs ${AZURE_STORAGE_BLOBS_HEADER} ${AZURE_STORAGE_BLOBS_SOURCE}) diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt index 4a86f9fb63..9e419922ec 100644 --- a/sdk/storage/azure-storage-common/CMakeLists.txt +++ b/sdk/storage/azure-storage-common/CMakeLists.txt @@ -47,10 +47,6 @@ set( inc/azure/storage/common/account_sas_builder.hpp inc/azure/storage/common/crypt.hpp inc/azure/storage/common/dll_import_export.hpp - inc/azure/storage/common/rtti.hpp - inc/azure/storage/common/storage_common.hpp - inc/azure/storage/common/storage_credential.hpp - inc/azure/storage/common/storage_exception.hpp inc/azure/storage/common/internal/concurrent_transfer.hpp inc/azure/storage/common/internal/constants.hpp inc/azure/storage/common/internal/file_io.hpp @@ -62,6 +58,10 @@ set( inc/azure/storage/common/internal/storage_service_version_policy.hpp inc/azure/storage/common/internal/storage_switch_to_secondary_policy.hpp inc/azure/storage/common/internal/xml_wrapper.hpp + inc/azure/storage/common/rtti.hpp + inc/azure/storage/common/storage_common.hpp + inc/azure/storage/common/storage_credential.hpp + inc/azure/storage/common/storage_exception.hpp ) set( @@ -69,6 +69,7 @@ set( src/account_sas_builder.cpp src/crypt.cpp src/file_io.cpp + src/private/package_version.hpp src/reliable_stream.cpp src/shared_key_policy.cpp src/storage_bearer_token_authentication_policy.cpp @@ -77,7 +78,6 @@ set( src/storage_per_retry_policy.cpp src/storage_switch_to_secondary_policy.cpp src/xml_wrapper.cpp - src/private/package_version.hpp ) add_library(azure-storage-common ${AZURE_STORAGE_COMMON_HEADER} ${AZURE_STORAGE_COMMON_SOURCE}) diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt index 9a45576b37..b3a4e36d03 100644 --- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt @@ -68,10 +68,10 @@ set( src/datalake_sas_builder.cpp src/datalake_service_client.cpp src/datalake_utilities.cpp - src/rest_client.cpp src/private/datalake_constants.hpp src/private/datalake_utilities.hpp src/private/package_version.hpp + src/rest_client.cpp ) add_library(azure-storage-files-datalake ${AZURE_STORAGE_FILES_DATALAKE_HEADER} ${AZURE_STORAGE_FILES_DATALAKE_SOURCE}) diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt index f3c577ffe3..39b6ae3877 100644 --- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt @@ -58,6 +58,7 @@ set( set( AZURE_STORAGE_FILES_SHARES_SOURCE + src/private/package_version.hpp src/rest_client.cpp src/share_client.cpp src/share_directory_client.cpp @@ -67,7 +68,6 @@ set( src/share_responses.cpp src/share_sas_builder.cpp src/share_service_client.cpp - src/private/package_version.hpp ) add_library(azure-storage-files-shares ${AZURE_STORAGE_FILES_SHARES_HEADER} ${AZURE_STORAGE_FILES_SHARES_SOURCE}) diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt index 7a0f345562..1239d6b14c 100644 --- a/sdk/storage/azure-storage-queues/CMakeLists.txt +++ b/sdk/storage/azure-storage-queues/CMakeLists.txt @@ -54,13 +54,13 @@ set( set( AZURE_STORAGE_QUEUES_SOURCE + src/private/package_version.hpp src/queue_client.cpp src/queue_options.cpp src/queue_responses.cpp src/queue_sas_builder.cpp src/queue_service_client.cpp src/rest_client.cpp - src/private/package_version.hpp ) add_library(azure-storage-queues ${AZURE_STORAGE_QUEUES_HEADER} ${AZURE_STORAGE_QUEUES_SOURCE}) diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt index 2428da7f74..a62f0e709e 100644 --- a/sdk/template/azure-template/CMakeLists.txt +++ b/sdk/template/azure-template/CMakeLists.txt @@ -49,8 +49,8 @@ set( set( AZURE_TEMPLATE_SOURCE - src/template_client.cpp src/private/package_version.hpp + src/template_client.cpp ) add_library(azure-template ${AZURE_TEMPLATE_HEADER} ${AZURE_TEMPLATE_SOURCE}) From e466d5b71a657e986250eb646f6e81b5f75e3eb3 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 25 Oct 2023 23:38:12 -0700 Subject: [PATCH 4/4] One more file --- sdk/core/perf/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/perf/CMakeLists.txt b/sdk/core/perf/CMakeLists.txt index 98643289ad..dc485d1052 100644 --- a/sdk/core/perf/CMakeLists.txt +++ b/sdk/core/perf/CMakeLists.txt @@ -21,9 +21,9 @@ set( inc/azure/perf/options.hpp inc/azure/perf/program.hpp inc/azure/perf/random_stream.hpp + inc/azure/perf/test.hpp inc/azure/perf/test_metadata.hpp inc/azure/perf/test_options.hpp - inc/azure/perf/test.hpp ) set(