diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake
index e4bd114b6..fa27fb906 100644
--- a/cmake-modules/AzureVcpkg.cmake
+++ b/cmake-modules/AzureVcpkg.cmake
@@ -18,7 +18,7 @@ macro(az_vcpkg_integrate)
       message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
       # GET VCPKG FROM SOURCE
       #  User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
-      set(VCPKG_COMMIT_STRING ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0) # default SDK tested commit
+      set(VCPKG_COMMIT_STRING 120deac3062162151622ca4860575a33844ba10b) # default SDK tested commit
       if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
         message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
         set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit
diff --git a/sdk/attestation/azure-security-attestation/cspell.json b/sdk/attestation/azure-security-attestation/cspell.json
index 4862947db..208858250 100644
--- a/sdk/attestation/azure-security-attestation/cspell.json
+++ b/sdk/attestation/azure-security-attestation/cspell.json
@@ -11,6 +11,7 @@
   ],
   "words": [
     "ECDS",
+    "Ecds",
     "jwks",
     "jwk",
     "mrenclave",
diff --git a/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp b/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp
index 20e521ed4..c0c394198 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp
@@ -13,11 +13,18 @@
 #include <utility>
 #include <vector>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 /**
  * @brief The Cryptography class provides a set of basic cryptographic primatives required
  * by the attestation samples.
@@ -84,7 +91,16 @@ std::string GetOpenSSLError(std::string const& what)
   }
 
   uint8_t* bioData;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
   long bufferSize = BIO_get_mem_data(bio.get(), &bioData);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
   std::string returnValue;
   returnValue.resize(bufferSize);
   memcpy(&returnValue[0], bioData, bufferSize);
@@ -140,7 +156,16 @@ public:
 
       // Now extract the data from the BIO and return it as a string.
       uint8_t* base64data;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
       long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
       std::string returnValue;
       returnValue.resize(bufferSize);
       memcpy(&returnValue[0], base64data, bufferSize);
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp
index a52791cea..3bcd3aed9 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp
@@ -7,8 +7,15 @@
 #include <type_traits>
 #include <utility>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/bio.h>
 #include <openssl/evp.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp
index 1fea3ed0f..98ecaf83e 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp
@@ -24,6 +24,10 @@
 #include <utility>
 #include <vector>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/ecdsa.h>
@@ -32,6 +36,9 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509v3.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 
 // cspell: words OpenSSL X509 OpenSSLX509 keyid
 
@@ -63,7 +70,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
 
     // Now extract the data from the BIO and return it as a string.
     uint8_t* base64data;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
     long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
     std::string returnValue;
     returnValue.resize(bufferSize);
     memcpy(&returnValue[0], base64data, bufferSize);
@@ -87,17 +103,34 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
     {
       throw OpenSSLException("i2d_X509_bio");
     }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
     if (BIO_flush(base64bio.get()) != 1)
     {
       throw OpenSSLException("BIO_flush");
     }
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 
     // Now that we've written to the underlying bio, pop it back
     // to the bio local so we can retrieve the base64 data which was written.
     bio.reset(BIO_pop(base64bio.get()));
 
     uint8_t* base64data;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
     long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
     std::string returnValue;
     returnValue.resize(bufferSize);
     memcpy(&returnValue[0], base64data, bufferSize);
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp
index af1414305..c1da53af4 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp
@@ -21,11 +21,18 @@
 #include <utility>
 #include <vector>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 
 // cspell::words OpenSSL X509 OpenSSLX509
 
@@ -88,7 +95,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
 
       // Now extract the data from the BIO and return it as a string.
       uint8_t* base64data;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
       long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
       std::string returnValue;
       returnValue.resize(bufferSize);
       memcpy(&returnValue[0], base64data, bufferSize);
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp
index ce9e4e668..fbcfa0167 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp
@@ -23,12 +23,19 @@
 #include <utility>
 #include <vector>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/bio.h>
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
@@ -52,7 +59,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
     }
     // Now extract the data from the BIO and return it as a string.
     uint8_t* base64data;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
     long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
     std::string returnValue;
     returnValue.resize(bufferSize);
     memcpy(&returnValue[0], base64data, bufferSize);
@@ -68,7 +84,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
     }
     // Now extract the data from the BIO and return it as a string.
     uint8_t* base64data;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
     long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
     std::string returnValue;
     returnValue.resize(bufferSize);
     memcpy(&returnValue[0], base64data, bufferSize);
@@ -249,7 +274,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
     }
 
     uint8_t* bioData;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
     long bufferSize = BIO_get_mem_data(bio.get(), &bioData);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
     std::string returnValue;
     returnValue.resize(bufferSize);
     memcpy(&returnValue[0], bioData, bufferSize);
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp
index a7e35d414..78062d57b 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp
@@ -19,10 +19,17 @@
 #include <utility>
 #include <vector>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt
index bb78ed2df..b1b7b3616 100644
--- a/sdk/core/azure-core-amqp/CMakeLists.txt
+++ b/sdk/core/azure-core-amqp/CMakeLists.txt
@@ -110,29 +110,28 @@ if (USE_RUST_AMQP)
   )
   FetchContent_MakeAvailable(Corrosion)
 
-  if (NOT APPLE)
-if(LINUX OR UNIX)
-  message(STATUS "Adding OpenSSL to target link libraries")
-  include(FindOpenSSL)
+if (NOT APPLE)
+  if(LINUX OR UNIX)
+    message(STATUS "Adding OpenSSL to target link libraries")
+    include(FindOpenSSL)
 
-  get_cmake_property(_variableNames VARIABLES)
-  foreach (_variableName ${_variableNames})
-    if (${_variableName} MATCHES "OPENSSL")
-      message(STATUS "Found variable: ${_variableName} = ${${_variableName}}")
-    endif()
-  endforeach()
+    get_cmake_property(_variableNames VARIABLES)
+    foreach (_variableName ${_variableNames})
+      if (${_variableName} MATCHES "OPENSSL")
+        message(STATUS "Found variable: ${_variableName} = ${${_variableName}}")
+      endif()
+    endforeach()
 
-  message(STATUS "OPENSSL_FOUND: ${OPENSSL_FOUND}")
-  message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
-  message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
-  message(STATUS "OPENSSL_CRYPTO_LIBRARY: ${OPENSSL_CRYPTO_LIBRARY}")
-  message(STATUS "OPENSSL_SSL_LIBRARY: ${OPENSSL_SSL_LIBRARY}")
-  message(STATUS "OPENSSL_DIR: ${OPENSSL_DIR}")
-  message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
-  message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
-  message(STATUS "OPENSSL_VERSION_STRING: ${OPENSSL_VERSION_STRING}")
-  
-endif()
+    message(STATUS "OPENSSL_FOUND: ${OPENSSL_FOUND}")
+    message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
+    message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
+    message(STATUS "OPENSSL_CRYPTO_LIBRARY: ${OPENSSL_CRYPTO_LIBRARY}")
+    message(STATUS "OPENSSL_SSL_LIBRARY: ${OPENSSL_SSL_LIBRARY}")
+    message(STATUS "OPENSSL_DIR: ${OPENSSL_DIR}")
+    message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
+    message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
+    message(STATUS "OPENSSL_VERSION_STRING: ${OPENSSL_VERSION_STRING}")
+  endif()
 endif()
 
 
@@ -333,7 +332,8 @@ elseif(USE_RUST_AMQP)
     message(STATUS "Assuming Windows crypto libraries")
     target_link_libraries(azure-core-amqp PRIVATE Secur32 ncrypt RuntimeObject)
   elseif (APPLE)
-    message(STATUS "Skipping library setting on macOS")
+    message(STATUS "Assuming Security framework on macOS")
+    target_link_libraries(azure-core-amqp PRIVATE "-framework Security")
   elseif(LINUX OR UNIX)
     message(STATUS "Assuming Linux crypto libraries.")
     target_link_libraries(azure-core-amqp PRIVATE ${OPENSSL_LIBRARIES})
diff --git a/sdk/core/azure-core/src/cryptography/md5.cpp b/sdk/core/azure-core/src/cryptography/md5.cpp
index 8aa597fdd..301b774dd 100644
--- a/sdk/core/azure-core/src/cryptography/md5.cpp
+++ b/sdk/core/azure-core/src/cryptography/md5.cpp
@@ -13,7 +13,14 @@
 
 #include <bcrypt.h>
 #elif defined(AZ_PLATFORM_POSIX)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/evp.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 #endif
 
 #include <stdexcept>
diff --git a/sdk/core/azure-core/src/cryptography/sha_hash.cpp b/sdk/core/azure-core/src/cryptography/sha_hash.cpp
index 8cf7a2dc2..043d97d15 100644
--- a/sdk/core/azure-core/src/cryptography/sha_hash.cpp
+++ b/sdk/core/azure-core/src/cryptography/sha_hash.cpp
@@ -12,7 +12,14 @@
 
 #include <bcrypt.h>
 #elif defined(AZ_PLATFORM_POSIX)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/evp.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 #endif
 
 #include "azure/core/internal/cryptography/sha_hash.hpp"
diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp
index a1178dd4e..2bd903c90 100644
--- a/sdk/core/azure-core/src/http/curl/curl.cpp
+++ b/sdk/core/azure-core/src/http/curl/curl.cpp
@@ -26,6 +26,10 @@
 #include "curl_session_private.hpp"
 
 #if defined(AZ_PLATFORM_POSIX)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 #define USE_OPENSSL_1
@@ -47,6 +51,9 @@
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
 #include <openssl/x509v3.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 #endif // AZ_PLATFORM_POSIX
 
 #if defined(AZ_PLATFORM_POSIX)
@@ -1631,7 +1638,16 @@ namespace Azure { namespace Core {
         }
 
         uint8_t* bioData;
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
         long bufferSize = BIO_get_mem_data(bio.get(), &bioData);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
         std::string returnValue;
         returnValue.resize(bufferSize);
         memcpy(&returnValue[0], bioData, bufferSize);
diff --git a/sdk/core/azure-core/test/ut/curl_options_test.cpp b/sdk/core/azure-core/test/ut/curl_options_test.cpp
index 069061305..2ccabd88c 100644
--- a/sdk/core/azure-core/test/ut/curl_options_test.cpp
+++ b/sdk/core/azure-core/test/ut/curl_options_test.cpp
@@ -12,7 +12,14 @@
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 #include "azure/core/http/curl_transport.hpp"
 #if defined(AZ_PLATFORM_POSIX)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/x509.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 #endif
 #endif
 
@@ -243,6 +250,7 @@ namespace Azure { namespace Core { namespace Test {
                         .ConnectionPoolIndex.clear());
   }
 
+#if !defined(AZ_PLATFORM_MAC)
   TEST(CurlTransportOptions, setCADirectory)
   {
     Azure::Core::Http::CurlTransportOptions curlOptions;
@@ -302,6 +310,7 @@ namespace Azure { namespace Core { namespace Test {
     }
 #endif
   }
+#endif // !defined(AZ_PLATFORM_MAC)
 
 #if _azure_DISABLE_HTTP_BIN_TESTS
   TEST(CurlConnectionPool, DISABLED_httpsDefault)
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp
index a1917a6bf..a01ca1a41 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp
+++ b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp
@@ -27,8 +27,8 @@
 #include <opentelemetry/logs/provider.h>
 #include <opentelemetry/sdk/logs/logger.h>
 #include <opentelemetry/sdk/trace/tracer.h>
+#include <opentelemetry/semconv/url_attributes.h>
 #include <opentelemetry/trace/provider.h>
-#include <opentelemetry/trace/semantic_conventions.h>
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/src/batch_stress_tests.cpp b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/src/batch_stress_tests.cpp
index 1c0e9fb64..f049be9d0 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/src/batch_stress_tests.cpp
+++ b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/src/batch_stress_tests.cpp
@@ -9,6 +9,8 @@
 #include <azure/identity/default_azure_credential.hpp>
 #include <azure/identity/environment_credential.hpp>
 
+#include <opentelemetry/semconv/exception_attributes.h>
+
 using namespace Azure::Messaging::EventHubs;
 
 namespace trace_sdk = opentelemetry::sdk::trace;
@@ -225,7 +227,7 @@ BatchStressTest::SendMessages()
   catch (std::exception const& ex)
   {
     GetTracer()->GetCurrentSpan()->AddEvent(
-        "Exception received", {{trace::SemanticConventions::kExceptionMessage, ex.what()}});
+        "Exception received", {{opentelemetry::semconv::exception::kExceptionMessage, ex.what()}});
     std::cerr << "Exception " << ex.what();
     throw;
   }
@@ -266,7 +268,7 @@ void BatchStressTest::ReceiveMessages(
   catch (std::exception const& ex)
   {
     GetTracer()->GetCurrentSpan()->AddEvent(
-        "Exception received", {{trace::SemanticConventions::kExceptionMessage, ex.what()}});
+        "Exception received", {{opentelemetry::semconv::exception::kExceptionMessage, ex.what()}});
     std::cerr << "Exception " << ex.what();
     throw;
   }
diff --git a/sdk/identity/azure-identity/src/client_certificate_credential.cpp b/sdk/identity/azure-identity/src/client_certificate_credential.cpp
index d6dd48e49..298c9d4a0 100644
--- a/sdk/identity/azure-identity/src/client_certificate_credential.cpp
+++ b/sdk/identity/azure-identity/src/client_certificate_credential.cpp
@@ -40,12 +40,19 @@
 
 #if !defined(AZ_PLATFORM_WINDOWS) \
     || (defined(WINAPI_PARTITION_DESKTOP) && !WINAPI_PARTITION_DESKTOP)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/ossl_typ.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 #endif
 
 using Azure::Identity::ClientCertificateCredential;
diff --git a/sdk/storage/azure-storage-common/src/crypt.cpp b/sdk/storage/azure-storage-common/src/crypt.cpp
index 54f14ebe7..726be2d65 100644
--- a/sdk/storage/azure-storage-common/src/crypt.cpp
+++ b/sdk/storage/azure-storage-common/src/crypt.cpp
@@ -14,11 +14,18 @@
 
 #include <bcrypt.h>
 #elif defined(AZ_PLATFORM_POSIX)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 #endif
 
 #include "azure/storage/common/storage_common.hpp"
diff --git a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
index e46536b54..d27985d10 100644
--- a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
+++ b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
@@ -615,7 +615,8 @@ namespace Azure { namespace Storage { namespace _internal {
   std::string XmlWriter::GetDocument()
   {
     return std::string(
-        reinterpret_cast<const char*>(m_context->buffer->content), m_context->buffer->use);
+        reinterpret_cast<const char*>(xmlBufferContent(m_context->buffer.get())),
+        xmlBufferLength(m_context->buffer.get()));
   }
 
 #endif
diff --git a/sdk/tables/azure-data-tables/src/xml_wrapper.cpp b/sdk/tables/azure-data-tables/src/xml_wrapper.cpp
index 76128d04a..9482962f2 100644
--- a/sdk/tables/azure-data-tables/src/xml_wrapper.cpp
+++ b/sdk/tables/azure-data-tables/src/xml_wrapper.cpp
@@ -617,7 +617,8 @@ namespace Azure { namespace Data { namespace Tables { namespace _detail { namesp
   {
     auto context = static_cast<XmlWriterContext*>(m_context);
     xmlBufferPtr buffer = context->buffer;
-    return std::string(reinterpret_cast<const char*>(buffer->content), buffer->use);
+    return std::string(
+        reinterpret_cast<const char*>(xmlBufferContent(buffer)), xmlBufferLength(buffer));
   }
 
 #endif
diff --git a/vcpkg.json b/vcpkg.json
index 50a112a9e..5daf7750e 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-sdk-for-cpp",
   "version": "1.5.0",
-  "builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
+  "builtin-baseline": "120deac3062162151622ca4860575a33844ba10b",
   "dependencies": [
     {
       "name": "curl"