Fix support for .NET 3.5

Author: jdnichollsc

src/Proyecto26.RestClient/Helpers/ExecuteOnMainThread.cs

@@ -1,5 +1,8 @@
+#if NET_40
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
+#endif
 using UnityEngine;
 
 namespace Proyecto26.Helper
@@ -18,6 +21,23 @@ namespace Proyecto26.Helper
     /// </example>
     public class ExecuteOnMainThread : MonoBehaviour
     {
+        private static ExecuteOnMainThread _instance;
+        public static ExecuteOnMainThread Instance { get { return _instance; } }
+
+        void Awake()
+        {
+            if (_instance != null && _instance != this)
+            {
+                Destroy(this.gameObject);
+            }
+            else
+            {
+                _instance = this;
+                DontDestroyOnLoad(this.gameObject);
+            }
+        }
+
+#if NET_40
         /// <summary>
         /// Store all instance of Action's and try to invoke them
         /// </summary>
@@ -30,11 +50,16 @@ void Update()
         {
             if (!RunOnMainThread.IsEmpty)
             {
-                while (RunOnMainThread.TryDequeue(out var action))
+                Action action;
+                while (RunOnMainThread.TryDequeue(out action))
                 {
-                    action?.Invoke();
+                    if (action != null) {
+                        action.Invoke();
+                        action = null;
+                    }
                 }
             }
         }
+#endif
     }
 }

src/Proyecto26.RestClient/Helpers/HttpBase.cs

@@ -98,7 +98,7 @@ private static RequestException CreateException(RequestHelper options, UnityWebR
             return new RequestException(options, request.error, IsHttpError, IsNetworkError, request.responseCode, options.ParseResponseBody ? request.downloadHandler.text : "body not parsed");
         }
 
-        private static void DebugLog(bool debugEnabled, object message, bool isError)
+        public static void DebugLog(bool debugEnabled, object message, bool isError)
         {
             if (debugEnabled)
             {

src/Proyecto26.RestClient/Helpers/RequestHelperExtension.cs

@@ -121,12 +121,17 @@ public bool DefaultContentType
         /// </summary>
         public void Abort()
         {
-            if (this.Request != null && !this.IsAborted)
+            if (!this.IsAborted && this.Request != null)
             {
                 try
                 {
                     this.IsAborted = true;
-                    this.Request.Abort();
+                    if (!this.Request.isDone) {
+                        this.Request.Abort();
+                    }
+                }
+                catch (Exception error) {
+                    HttpBase.DebugLog(this.EnableDebug, error.Message, true);
                 }
                 finally
                 {

src/Proyecto26.RestClient/RestClient.cs

@@ -14,21 +14,25 @@ public static partial class RestClient
     {
         #region Common
 
+        private static System.Version _version;
         /// <summary>
         /// Gets the version of the RestClient library.
         /// </summary>
         public static System.Version Version
         {
             get
             {
-                return Version.Parse("2.6.2");
+                if (_version == null) {
+                    _version = new System.Version("2.6.2");
+                }
+                return _version;
             }
         }
 
+        private static Dictionary<string, string> _defaultRequestParams;
         /// <summary>
         /// Default query string params.
         /// </summary>
-        private static Dictionary<string, string> _defaultRequestParams;
         public static Dictionary<string, string> DefaultRequestParams
         {
             get