diff --git a/.clang-format b/.clang-format index 92664c631..f0ce2151d 100644 --- a/.clang-format +++ b/.clang-format @@ -43,9 +43,6 @@ UseTab: Never IncludeCategories: - Regex: '^$' Priority: 80 -# Note: get_env.hpp must be included before any other Azure SDK headers. - - Regex: '^["<]get_env.hpp' - Priority: 10 - Regex: '<[[:alnum:]_.]+>' Priority: 90 - Regex: '' diff --git a/samples/helpers/get-env/inc/get_env.hpp b/samples/helpers/get-env/inc/get_env.hpp index 008bf78bf..8e39a51c6 100644 --- a/samples/helpers/get-env/inc/get_env.hpp +++ b/samples/helpers/get-env/inc/get_env.hpp @@ -7,22 +7,8 @@ #pragma once -#if !defined(_MSC_VER) - -// Linux and macOS -#include - -#else -#define _CRT_SECURE_NO_WARNINGS - -#if !defined(WIN32_LEAN_AND_MEAN) -#define WIN32_LEAN_AND_MEAN -#endif -#if !defined(NOMINMAX) -#define NOMINMAX -#endif -#include - +// The AppStore partition for the Win32 API surface does not include a definition for std::getenv, +// so we provide our own definition here. #if !defined(WINAPI_PARTITION_DESKTOP) || WINAPI_PARTITION_DESKTOP // Win32 #include @@ -33,7 +19,6 @@ char* getenv(const char* name); } #endif -#endif #include #include @@ -41,7 +26,14 @@ struct GetEnvHelper { static std::string GetEnv(char const* env) { +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4996) +#endif auto const val = std::getenv(env); +#if defined(_MSC_VER) +#pragma warning(pop) +#endif if (val == nullptr) { throw std::runtime_error("Could not find required environment variable: " + std::string(env)); diff --git a/samples/integration/cmake-fetch-content/src/main.cpp b/samples/integration/cmake-fetch-content/src/main.cpp index 904255f1b..0cc0d158c 100644 --- a/samples/integration/cmake-fetch-content/src/main.cpp +++ b/samples/integration/cmake-fetch-content/src/main.cpp @@ -9,8 +9,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/samples/integration/vcpkg-all-smoke/CMakeLists.txt b/samples/integration/vcpkg-all-smoke/CMakeLists.txt index 48b6ff6ed..a67211c36 100644 --- a/samples/integration/vcpkg-all-smoke/CMakeLists.txt +++ b/samples/integration/vcpkg-all-smoke/CMakeLists.txt @@ -16,6 +16,10 @@ project(vcpkg-all-smoke LANGUAGES CXX) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED True) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_executable ( vcpkg-all-smoke src/main diff --git a/samples/integration/vcpkg-all-smoke/src/main.cpp b/samples/integration/vcpkg-all-smoke/src/main.cpp index 705a59a43..907711e4d 100644 --- a/samples/integration/vcpkg-all-smoke/src/main.cpp +++ b/samples/integration/vcpkg-all-smoke/src/main.cpp @@ -6,8 +6,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp index 92fa12594..0c0d61038 100644 --- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp +++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp @@ -21,14 +21,13 @@ * */ -#include - #include "attestation_collateral.hpp" #include #include #include +#include #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp index 3f0cc9114..d3146dc2f 100644 --- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp +++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp @@ -21,14 +21,13 @@ * */ -#include - #include "attestation_collateral.hpp" #include #include #include +#include #include #include @@ -90,13 +89,3 @@ issuancerules { } return 0; } - -std::string GetEnv(char const* env) -{ - auto const val = std::getenv(env); - if (val == nullptr) - { - throw std::runtime_error("Could not find required environment variable: " + std::string(env)); - } - return std::string(val); -} \ No newline at end of file diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp index cd97b7b68..5106aee91 100644 --- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp +++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp @@ -21,14 +21,13 @@ * */ -#include - #include "attestation_collateral.hpp" #include #include #include +#include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp index cb9ff6bd8..0bb90b6b5 100644 --- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp +++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp @@ -21,14 +21,13 @@ * */ -#include - #include "attestation_collateral.hpp" #include #include #include +#include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp index b7a18a96f..7f76b422b 100644 --- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp +++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp @@ -21,14 +21,13 @@ * */ -#include - #include "attestation_collateral.hpp" #include #include #include +#include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp index 394d9cb79..7ed29801a 100644 --- a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp +++ b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp @@ -17,12 +17,11 @@ * */ -#include - #include #include #include +#include #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp index eeaa32ce6..585c1fa73 100644 --- a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp +++ b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp @@ -13,11 +13,10 @@ * */ -#include - #include #include +#include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/basic-operations/get_open-id_metadata.cpp b/sdk/attestation/azure-security-attestation/samples/basic-operations/get_open-id_metadata.cpp index 02fa98dc2..a787aeead 100644 --- a/sdk/attestation/azure-security-attestation/samples/basic-operations/get_open-id_metadata.cpp +++ b/sdk/attestation/azure-security-attestation/samples/basic-operations/get_open-id_metadata.cpp @@ -15,11 +15,10 @@ * */ -#include - #include #include +#include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/basic-operations/get_signing_certificates.cpp b/sdk/attestation/azure-security-attestation/samples/basic-operations/get_signing_certificates.cpp index 1c1dec1ef..8ffff392b 100644 --- a/sdk/attestation/azure-security-attestation/samples/basic-operations/get_signing_certificates.cpp +++ b/sdk/attestation/azure-security-attestation/samples/basic-operations/get_signing_certificates.cpp @@ -15,11 +15,10 @@ * */ -#include - #include #include +#include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp b/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp index d81e7fbed..c24494393 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp +++ b/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp @@ -23,14 +23,13 @@ * */ -#include - #include "cryptohelpers.hpp" #include #include #include +#include #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp b/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp index d289751dc..1eed53927 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp +++ b/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp @@ -18,14 +18,13 @@ * */ -#include - #include "cryptohelpers.hpp" #include #include #include +#include #include #include #include @@ -37,17 +36,17 @@ using namespace Azure::Security::Attestation::Models; using namespace std::chrono_literals; using namespace Azure::Core; -std::string GetEnv(char const* env); - int main() { try { // create an administration client auto const credential = std::make_shared( - GetEnv("AZURE_TENANT_ID"), GetEnv("AZURE_CLIENT_ID"), GetEnv("AZURE_CLIENT_SECRET")); - AttestationAdministrationClient adminClient( - AttestationAdministrationClient::Create(GetEnv("ATTESTATION_ISOLATED_URL"), credential)); + GetEnvHelper::GetEnv("AZURE_TENANT_ID"), + GetEnvHelper::GetEnv("AZURE_CLIENT_ID"), + GetEnvHelper::GetEnv("AZURE_CLIENT_SECRET")); + AttestationAdministrationClient adminClient(AttestationAdministrationClient::Create( + GetEnvHelper::GetEnv("ATTESTATION_ISOLATED_URL"), credential)); // Retrieve the SGX Attestation Policy from this attestation service instance. Azure::Response> const policyCertificates @@ -89,13 +88,3 @@ int main() } return 0; } - -std::string GetEnv(char const* env) -{ - auto const val = std::getenv(env); - if (val == nullptr) - { - throw std::runtime_error("Could not find required environment variable: " + std::string(env)); - } - return std::string(val); -} diff --git a/sdk/attestation/azure-security-attestation/samples/policy/get_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/get_policy.cpp index c469e4ada..6a564257f 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy/get_policy.cpp +++ b/sdk/attestation/azure-security-attestation/samples/policy/get_policy.cpp @@ -14,12 +14,11 @@ * */ -#include - #include #include #include +#include #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp index 77403e3a4..65ac38846 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp +++ b/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp @@ -16,8 +16,6 @@ * */ -#include - #include #include #include @@ -25,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp index 757b37e4c..33e2b5146 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp +++ b/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp @@ -17,8 +17,6 @@ * */ -#include - #include "cryptohelpers.hpp" #include @@ -28,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp index 4c45487d0..d36877dee 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp +++ b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp @@ -16,8 +16,6 @@ * */ -#include - #include #include #include @@ -25,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp index c736d8a0d..5171d8e36 100644 --- a/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp +++ b/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp @@ -17,8 +17,6 @@ * */ -#include - #include "cryptohelpers.hpp" #include @@ -29,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp index ea6ee56c6..966c1c727 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-Licence-Identifier: MIT -#undef _CRT_SECURE_NO_WARNINGS -#include - #include #include @@ -24,7 +21,7 @@ int main() std::string targetEntity = credentials->GetEntityPath(); if (targetEntity.empty()) { - targetEntity = GetEnvHelper::GetEnv("EVENTHUB_NAME"); + targetEntity = std::getenv("EVENTHUB_NAME"); } Azure::Core::Amqp::_internal::ConnectionOptions connectionOptions; connectionOptions.ContainerId = "some"; diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp index dbecd6cd7..d032ebaae 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-Licence-Identifier: MIT -#undef _CRT_SECURE_NO_WARNINGS -#include - #include #include #include @@ -160,14 +157,14 @@ int main() // Retrieve the eventhub connection string so we can extract the host name and entity name. We // are NOT using the connection string to authenticate with the eventhub, only to retrieve the // host name and entity (if present). - std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING"); + std::string eventhubConnectionString = std::getenv("EVENTHUB_CONNECTION_STRING"); Azure::Core::Amqp::_internal::ConnectionStringParser connectionParser(eventhubConnectionString); std::string eventhubsHost = connectionParser.GetHostName(); std::string eventhubsEntity = connectionParser.GetEntityPath(); if (eventhubsEntity.empty()) { - eventhubsEntity = GetEnvHelper::GetEnv("EVENTHUB_NAME"); + eventhubsEntity = std::getenv("EVENTHUB_NAME"); } // Establish the connection to the eventhub. @@ -179,9 +176,9 @@ int main() connectionParser.GetHostName(), connectionOptions); auto credential{std::make_shared( - GetEnvHelper::GetEnv("SAMPLES_TENANT_ID"), - GetEnvHelper::GetEnv("SAMPLES_CLIENT_ID"), - GetEnvHelper::GetEnv("SAMPLES_CLIENT_SECRET"))}; + std::getenv("SAMPLES_TENANT_ID"), + std::getenv("SAMPLES_CLIENT_ID"), + std::getenv("SAMPLES_CLIENT_SECRET"))}; // Establish a session to the eventhub. Azure::Core::Amqp::_internal::SessionOptions sessionOptions; diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp index 346b2e09b..b05c3ed76 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-Licence-Identifier: MIT -#undef _CRT_SECURE_NO_WARNINGS -#include - #include #include #include @@ -15,7 +12,7 @@ int main() { - std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING"); + std::string eventhubConnectionString = std::getenv("EVENTHUB_CONNECTION_STRING"); auto credential = std::make_shared( @@ -23,7 +20,7 @@ int main() std::string entityPath = credential->GetEntityPath(); if (entityPath.empty()) { - entityPath = GetEnvHelper::GetEnv("EVENTHUB_NAME"); + entityPath = std::getenv("EVENTHUB_NAME"); } Azure::Core::Amqp::_internal::ConnectionOptions connectionOptions; diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp index 41ed5d545..f6cabac7f 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-Licence-Identifier: MIT -#undef _CRT_SECURE_NO_WARNINGS -#include - #include #include #include @@ -15,7 +12,7 @@ int main() { - std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING"); + std::string eventhubConnectionString = std::getenv("EVENTHUB_CONNECTION_STRING"); auto credential{ std::make_shared( @@ -23,7 +20,7 @@ int main() std::string entityPath = credential->GetEntityPath(); if (entityPath.empty()) { - entityPath = GetEnvHelper::GetEnv("EVENTHUB_NAME"); + entityPath = std::getenv("EVENTHUB_NAME"); } Azure::Core::Amqp::_internal::ConnectionOptions connectionOptions; connectionOptions.ContainerId = "some"; diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp index d4f6fb744..4aeba231e 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-Licence-Identifier: MIT -#undef _CRT_SECURE_NO_WARNINGS -#include - #include #include #include @@ -15,7 +12,7 @@ int main() { - std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING"); + std::string eventhubConnectionString = std::getenv("EVENTHUB_CONNECTION_STRING"); auto credential = std::make_shared( @@ -23,7 +20,7 @@ int main() std::string entityPath = credential->GetEntityPath(); if (entityPath.empty()) { - entityPath = GetEnvHelper::GetEnv("EVENTHUB_NAME"); + entityPath = std::getenv("EVENTHUB_NAME"); } Azure::Core::Amqp::_internal::ConnectionOptions connectionOptions; diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp index 2cb50a67c..2b1fa4b5d 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-Licence-Identifier: MIT -#undef _CRT_SECURE_NO_WARNINGS -#include - #include #include #include @@ -21,7 +18,7 @@ int main() { // Retrieve the eventhub connection string so we can extract the host name and entity name. We are // NOT using the connection string to connect to the eventhub. - std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING"); + std::string eventhubConnectionString = std::getenv("EVENTHUB_CONNECTION_STRING"); Azure::Core::Amqp::_internal::ConnectionStringParser connectionStringCredential( eventhubConnectionString); std::string eventhubsHost = connectionStringCredential.GetHostName(); @@ -31,14 +28,14 @@ int main() // environment variable. if (eventhubsEntity.empty()) { - eventhubsEntity = GetEnvHelper::GetEnv("EVENTHUB_NAME"); + eventhubsEntity = std::getenv("EVENTHUB_NAME"); } // Establish credentials for the eventhub client. auto credential{std::make_shared( - GetEnvHelper::GetEnv("SAMPLES_TENANT_ID"), - GetEnvHelper::GetEnv("SAMPLES_CLIENT_ID"), - GetEnvHelper::GetEnv("SAMPLES_CLIENT_SECRET"))}; + std::getenv("SAMPLES_TENANT_ID"), + std::getenv("SAMPLES_CLIENT_ID"), + std::getenv("SAMPLES_CLIENT_SECRET"))}; Azure::Core::Amqp::_internal::ConnectionOptions connectionOptions; connectionOptions.ContainerId = "some"; diff --git a/sdk/identity/azure-identity/samples/CMakeLists.txt b/sdk/identity/azure-identity/samples/CMakeLists.txt index c9ceca877..18c82f1f0 100644 --- a/sdk/identity/azure-identity/samples/CMakeLists.txt +++ b/sdk/identity/azure-identity/samples/CMakeLists.txt @@ -7,6 +7,10 @@ project (azure-identity-samples LANGUAGES CXX) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED True) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_executable(azure_cli_credential_sample azure_cli_credential.cpp) target_link_libraries(azure_cli_credential_sample PRIVATE azure-identity service) target_include_directories(azure_cli_credential_sample PRIVATE .) diff --git a/sdk/identity/azure-identity/samples/client_certificate_credential.cpp b/sdk/identity/azure-identity/samples/client_certificate_credential.cpp index 92034ddeb..153449505 100644 --- a/sdk/identity/azure-identity/samples/client_certificate_credential.cpp +++ b/sdk/identity/azure-identity/samples/client_certificate_credential.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include - #include #include diff --git a/sdk/identity/azure-identity/samples/client_secret_credential.cpp b/sdk/identity/azure-identity/samples/client_secret_credential.cpp index 9ca979534..3278d7d98 100644 --- a/sdk/identity/azure-identity/samples/client_secret_credential.cpp +++ b/sdk/identity/azure-identity/samples/client_secret_credential.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include - #include #include diff --git a/sdk/keyvault/azure-security-keyvault-administration/test/samples/sample1-basic-operations/sample1_administration.cpp b/sdk/keyvault/azure-security-keyvault-administration/test/samples/sample1-basic-operations/sample1_administration.cpp index b82f14dfe..44acbb26b 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/test/samples/sample1-basic-operations/sample1_administration.cpp +++ b/sdk/keyvault/azure-security-keyvault-administration/test/samples/sample1-basic-operations/sample1_administration.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/CMakeLists.txt index 1034f45f6..81d9a2db3 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.13) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_subdirectory(certificate-basic-operations) add_subdirectory(certificate-get-certificates) add_subdirectory(certificate-import-certificate) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp index 74b349cef..1cad1ce5d 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp index da75bf9c9..4f2fd7df4 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp @@ -16,8 +16,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp index 3e7102663..fea62cb09 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/test/samples/CMakeLists.txt index cb3e8d465..8efaf9d7f 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.13) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_subdirectory(sample1-hello-world) add_subdirectory(sample2-backup-and-restore) add_subdirectory(sample3-get-keys) diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp index c67dfd520..77ae29cee 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp index db9ab83a3..3b35db5f8 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp index 8484e691f..d3d87dbdf 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp @@ -14,8 +14,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp index 500a58a81..cdbc0559c 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp index 85251a18a..2cf82aa65 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp index 68092365b..97764fac1 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample7-key-rotation/sample7_key_rotation.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample7-key-rotation/sample7_key_rotation.cpp index 554e78bc5..b19f33ca8 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample7-key-rotation/sample7_key_rotation.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample7-key-rotation/sample7_key_rotation.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/CMakeLists.txt index 0e783fd8e..d07fc319d 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.13) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_subdirectory(sample1-basic-operations) add_subdirectory(sample2-backup-restore) add_subdirectory(sample3-delete-recover) diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp index 4362030ef..764778801 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp index 2fe8637ec..e4e7d253a 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp index 6197db18f..c802a5c63 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp index e80c8d4df..19d0a0ec5 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include diff --git a/sdk/keyvault/tools/cleanup/src/cleanup.cpp b/sdk/keyvault/tools/cleanup/src/cleanup.cpp index de2aa286e..dd273a512 100644 --- a/sdk/keyvault/tools/cleanup/src/cleanup.cpp +++ b/sdk/keyvault/tools/cleanup/src/cleanup.cpp @@ -13,8 +13,6 @@ * */ -#include "get_env.hpp" - #include #include #include diff --git a/sdk/storage/azure-storage-blobs/samples/CMakeLists.txt b/sdk/storage/azure-storage-blobs/samples/CMakeLists.txt index 9f98c022d..7ce1ed5fd 100644 --- a/sdk/storage/azure-storage-blobs/samples/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/samples/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.13) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_executable(blob-getting-started blob_getting_started.cpp) target_link_libraries(blob-getting-started PRIVATE azure-storage-blobs get-env-helper) create_per_service_target_build_for_sample(storage blob-getting-started) diff --git a/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp b/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp index 38fa26a78..f7d815058 100644 --- a/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp +++ b/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include diff --git a/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp b/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp index f27b35c19..30df4ffc4 100644 --- a/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp +++ b/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include diff --git a/sdk/storage/azure-storage-blobs/samples/blob_query.cpp b/sdk/storage/azure-storage-blobs/samples/blob_query.cpp index fab1b7bc2..a9f132f0d 100644 --- a/sdk/storage/azure-storage-blobs/samples/blob_query.cpp +++ b/sdk/storage/azure-storage-blobs/samples/blob_query.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include diff --git a/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp b/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp index d851a2e60..684144284 100644 --- a/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp +++ b/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include diff --git a/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp b/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp index b725a8fe0..94b3d18f8 100644 --- a/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp +++ b/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp @@ -1,10 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include -#include +#include #include #include diff --git a/sdk/storage/azure-storage-files-datalake/samples/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/samples/CMakeLists.txt index 1ec0137cd..136d20cf3 100644 --- a/sdk/storage/azure-storage-files-datalake/samples/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/samples/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.13) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_executable(datalake-getting-started datalake_getting_started.cpp) create_per_service_target_build_for_sample(storage datalake-getting-started) target_link_libraries(datalake-getting-started PRIVATE azure-storage-files-datalake get-env-helper) diff --git a/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp b/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp index 127ffab8b..ef321db64 100644 --- a/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp +++ b/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include diff --git a/sdk/storage/azure-storage-files-shares/samples/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/samples/CMakeLists.txt index c4a1839b6..171a19012 100644 --- a/sdk/storage/azure-storage-files-shares/samples/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/samples/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.13) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_executable(file-share-getting-started file_share_getting_started.cpp) create_per_service_target_build_for_sample(storage file-share-getting-started) target_link_libraries(file-share-getting-started PRIVATE azure-storage-files-shares get-env-helper) diff --git a/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp b/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp index aad9cb354..501b0f088 100644 --- a/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp +++ b/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include diff --git a/sdk/storage/azure-storage-queues/samples/CMakeLists.txt b/sdk/storage/azure-storage-queues/samples/CMakeLists.txt index 8177519a5..6e42c6740 100644 --- a/sdk/storage/azure-storage-queues/samples/CMakeLists.txt +++ b/sdk/storage/azure-storage-queues/samples/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.13) +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + add_executable(queue-getting-started queue_getting_started.cpp) target_link_libraries(queue-getting-started PRIVATE azure-storage-queues get-env-helper) create_per_service_target_build_for_sample(storage queue-getting-started) diff --git a/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp b/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp index 3c16c2de9..20886f863 100644 --- a/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp +++ b/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include diff --git a/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp b/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp index 00b8311c3..10c35eff4 100644 --- a/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp +++ b/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "get_env.hpp" - #include #include