Merge branch 'main' into update_codeql_v4

Author: ThomsonTan

lib/include/public/Version.hpp

@@ -6,8 +6,8 @@
 #define MAT_VERSION_HPP
 // WARNING: DO NOT MODIFY THIS FILE!
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.9.324.1"
-#define BUILD_VERSION 3,9,324,1
+#define BUILD_VERSION_STR "3.10.5.1"
+#define BUILD_VERSION 3,10,5,1
 
 #ifndef RESOURCE_COMPILER_INVOKED
 #include "ctmacros.hpp"
@@ -17,8 +17,8 @@ namespace MAT_NS_BEGIN {
 
 uint64_t const Version =
     ((uint64_t)3 << 48) |
-    ((uint64_t)9 << 32) |
-    ((uint64_t)324 << 16) |
+    ((uint64_t)10 << 32) |
+    ((uint64_t)5 << 16) |
     ((uint64_t)1);
 
 } MAT_NS_END
@@ -27,4 +27,3 @@ namespace PAL_NS_BEGIN { } PAL_NS_END
 
 #endif // RESOURCE_COMPILER_INVOKED
 #endif
-

lib/pal/posix/NetworkInformationImpl.mm

@@ -103,37 +103,6 @@ virtual NetworkCost GetNetworkCost()
 
     void NetworkInformation::SetupNetDetect()
     {
-        auto weak_this = std::weak_ptr<NetworkInformation>(shared_from_this());
-
-        m_reach = [ODWReachability reachabilityForInternetConnection];
-        void (^block)(NSNotification*) = ^(NSNotification*)
-        {
-            auto strong_this = weak_this.lock();
-            if (!strong_this)
-            {
-                return;
-            }
-
-            // NetworkCost information is not available until iOS 12.
-            // Just make the best guess here.
-            switch (m_reach.currentReachabilityStatus)
-            {
-                case NotReachable:
-                    strong_this->UpdateType(NetworkType_Unknown);
-                    strong_this->UpdateCost(NetworkCost_Unknown);
-                    break;
-                case ReachableViaWiFi:
-                    strong_this->UpdateType(NetworkType_Wifi);
-                    strong_this->UpdateCost(NetworkCost_Unmetered);
-                    break;
-                case ReachableViaWWAN:
-                    strong_this->UpdateType(NetworkType_WWAN);
-                    strong_this->UpdateCost(NetworkCost_Metered);
-                    break;
-            }
-        };
-        block(nil); // Update the initial status.
-        
         if (@available(macOS 10.14, iOS 12.0, *))
         {
             m_monitor = nw_path_monitor_create();
@@ -186,15 +155,49 @@ virtual NetworkCost GetNetworkCost()
                 nw_path_monitor_cancel(m_monitor);
             }
         }
-        else if (m_isNetDetectEnabled)
+        else
         {
-            m_notificationId =
-                [[NSNotificationCenter defaultCenter]
-                addObserverForName: kNetworkReachabilityChangedNotification
-                object: nil
-                queue: nil
-                usingBlock: block];
-            [m_reach startNotifier];
+            auto weak_this = std::weak_ptr<NetworkInformation>(shared_from_this());
+
+            m_reach = [ODWReachability reachabilityForInternetConnection];
+            void (^block)(NSNotification*) = ^(NSNotification*)
+            {
+                auto strong_this = weak_this.lock();
+                if (!strong_this)
+                {
+                    return;
+                }
+
+                // NetworkCost information is not available until iOS 12.
+                // Just make the best guess here.
+                switch (m_reach.currentReachabilityStatus)
+                {
+                    case NotReachable:
+                        strong_this->UpdateType(NetworkType_Unknown);
+                        strong_this->UpdateCost(NetworkCost_Unknown);
+                        break;
+                    case ReachableViaWiFi:
+                        strong_this->UpdateType(NetworkType_Wifi);
+                        strong_this->UpdateCost(NetworkCost_Unmetered);
+                        break;
+                    case ReachableViaWWAN:
+                        strong_this->UpdateType(NetworkType_WWAN);
+                        strong_this->UpdateCost(NetworkCost_Metered);
+                        break;
+                }
+            };
+            block(nil); // Update the initial status.
+
+            if (m_isNetDetectEnabled)
+            {
+                m_notificationId =
+                    [[NSNotificationCenter defaultCenter]
+                    addObserverForName: kNetworkReachabilityChangedNotification
+                    object: nil
+                    queue: nil
+                    usingBlock: block];
+                [m_reach startNotifier];
+            }
         }
     }