[ECO-5584] Updated Platform.PlatformId property to be thread safe

Author: sacOO7

src/IO.Ably.NETFramework/Platform.cs

@@ -9,24 +9,14 @@ internal class Platform : IPlatform
     {
         private static readonly object _lock = new object();
 
-        static Platform()
-        {
-            Initialize();
-        }
-
-        internal static bool HookedUpToNetworkEvents { get; private set; }
+        internal static bool HookedUpToNetworkEvents { get; set; }
 
         public Agent.PlatformRuntime PlatformId => Agent.PlatformRuntime.Framework;
 
         public ITransportFactory TransportFactory => null;
 
         public IMobileDevice MobileDevice { get; set; }
 
-        internal static void Initialize()
-        {
-            HookedUpToNetworkEvents = false;
-        }
-
         public void RegisterOsNetworkStateChanged()
         {
             lock (_lock)

src/IO.Ably.NETStandard20/Platform.cs

@@ -1,4 +1,5 @@
-using System.Net.NetworkInformation;
+using System;
+using System.Net.NetworkInformation;
 using System.Runtime.InteropServices;
 using IO.Ably.Push;
 using IO.Ably.Realtime;
@@ -9,63 +10,51 @@ namespace IO.Ably
     internal class Platform : IPlatform
     {
         private static readonly object Lock = new object();
-        private Agent.PlatformRuntime? _platformId;
+        private readonly Lazy<Agent.PlatformRuntime> _platformId;
 
-        static Platform()
+        public Platform()
         {
-            Initialize();
+            _platformId = new Lazy<Agent.PlatformRuntime>(DetectPlatformRuntime);
         }
 
-        internal static bool HookedUpToNetworkEvents { get; private set; }
+        internal static bool HookedUpToNetworkEvents { get; set; }
 
         // Use runtime detection via RuntimeInformation.FrameworkDescription
         // This detects the actual runtime version, not the compile-time target framework
         // This is important because netstandard2.0 assemblies can run on .NET 6/7/8/9+
         // and we want to report the actual runtime being used
-        public Agent.PlatformRuntime PlatformId
+        public Agent.PlatformRuntime PlatformId => _platformId.Value;
+
+        private Agent.PlatformRuntime DetectPlatformRuntime()
         {
-            get
-            {
-                if (_platformId.HasValue)
-                {
-                    return _platformId.Value;
-                }
+            // Default fallback for netstandard2.0 or unknown runtimes
+            var platformId = Agent.PlatformRuntime.Netstandard20;
 
-                // Default fallback for netstandard2.0 or unknown runtimes
-                _platformId = Agent.PlatformRuntime.Netstandard20;
+            try
+            {
+                var frameworkDescription = RuntimeInformation.FrameworkDescription;
 
-                try
+                if (frameworkDescription.StartsWith(".NET 6.", StringComparison.OrdinalIgnoreCase))
                 {
-                    var frameworkDescription = RuntimeInformation.FrameworkDescription;
-
-                    if (frameworkDescription.StartsWith(".NET 6.", System.StringComparison.OrdinalIgnoreCase))
-                    {
-                        _platformId = Agent.PlatformRuntime.Net6;
-                    }
-
-                    if (frameworkDescription.StartsWith(".NET 7.", System.StringComparison.OrdinalIgnoreCase))
-                    {
-                        _platformId = Agent.PlatformRuntime.Net7;
-                    }
+                    platformId = Agent.PlatformRuntime.Net6;
                 }
-                catch
+                else if (frameworkDescription.StartsWith(".NET 7.", StringComparison.OrdinalIgnoreCase))
                 {
-                    // fall back to Netstandard20
+                    platformId = Agent.PlatformRuntime.Net7;
                 }
-
-                return _platformId.Value;
             }
+            catch
+            {
+                // fall back to Netstandard20
+            }
+
+            return platformId;
         }
 
         public ITransportFactory TransportFactory => null;
 
         public IMobileDevice MobileDevice { get; set; }
 
-        internal static void Initialize()
-        {
-            HookedUpToNetworkEvents = false;
-        }
-
         public void RegisterOsNetworkStateChanged()
         {
             lock (Lock)

src/IO.Ably.Tests.Shared/Realtime/RealtimeSpecs.cs

@@ -136,9 +136,9 @@ public void New_Realtime_HasAuth()
         public void AutomaticNetworkDetectionCanBeDisabledByClientOption(bool enabled)
         {
             // Because this test depends on static state in the 'Platform' type we need
-            // to (re)Initialize the static 'Platform' state before each test run.
+            // to reset the static 'Platform' state before each test run.
 
-            Platform.Initialize();
+            Platform.HookedUpToNetworkEvents = false;
 
             _ = new AblyRealtime(new ClientOptions(ValidKey)
             {