Merge branch 'onesdk' of https://msasg.visualstudio.com/DefaultCollection/Shared%20Data/_git/Aria.SDK.Cpp into makoscum-oacr-uninitialized-datamember

lib/api/ContextFieldsProvider.cpp

@@ -171,6 +171,7 @@ namespace ARIASDK_NS_BEGIN
                     {
                         size_t len = strlen(deviceId);
                         if (len >= 2 && deviceId[1] == ':' && (
+                            deviceId[0] == 'u' || // u: Mac OS X UUID
                             deviceId[0] == 'a' || // a: Android ID
                             deviceId[0] == 's' || // s: SQM ID
                             deviceId[0] == 'x'))  // x: XBox One hardware ID

lib/api/ContextFieldsProvider.hpp

@@ -24,7 +24,6 @@ namespace ARIASDK_NS_BEGIN
         ContextFieldsProvider(ContextFieldsProvider* parent);
         ContextFieldsProvider(ContextFieldsProvider const& copy);
         ContextFieldsProvider& operator=(ContextFieldsProvider const& copy);
-        virtual ~ContextFieldsProvider() noexcept = default;
 
         virtual void SetCommonField(const std::string&  name, const EventProperty&  value) override;
         void writeToRecord(::CsProtocol::Record& record, bool commonOnly = false);

lib/api/IRuntimeConfig.hpp

@@ -181,6 +181,8 @@ namespace ARIASDK_NS_BEGIN
         /// </summary>
         /// <returns>Provider Group Id</returns>
         virtual const char* GetProviderGroupId() = 0;
+
+        virtual ~IRuntimeConfig() {};
     };
 
     /// @endcond

lib/pal/posix/sysinfo_sources.cpp

@@ -259,10 +259,11 @@ public:
         if (!get("devId").compare(""))
         {
 #ifdef __APPLE__
-        	// std::string contents = Exec("ioreg -d2 -c IOPlatformExpertDevice | awk -F\" '/IOPlatformUUID/{print $(NF-1)}'");
-        	char deviceId[512] = { 0 };
-        	get_platform_uuid(deviceId, sizeof(deviceId));
-        	cache["devId"] = MAT::GUID_t(deviceId).to_string(); // TODO: [MG] - do we need to prepend i:{...} here?
+            // std::string contents = Exec("ioreg -d2 -c IOPlatformExpertDevice | awk -F\" '/IOPlatformUUID/{print $(NF-1)}'");
+            char deviceId[512] = { 0 };
+            get_platform_uuid(deviceId, sizeof(deviceId));
+            cache["devId"] = "u:";
+            cache["devId"] += MAT::GUID_t(deviceId).to_string();
 #else
             // We were unable to obtain Device Id using standard means.
             // Try to use hash of blkid + hostname instead. Both blkid