Merge pull request #133 from timcassell/fix-il2cpp

Fix IL2CPP bugs

Author: timcassell

ProtoPromise_Unity/Assets/Plugins/ProtoPromise/Core/Promises/Internal/PromiseInternal.cs

@@ -135,7 +135,8 @@ internal static bool TryWaitForCompletion(PromiseRefBase promise, short promiseI
                     if (waiter._isHookingUp)
                     {
                         waiter._isHookingUp = false;
-                        waiter._didWaitSuccessfully = Monitor.Wait(waiter, timeout);
+                        // If timeout is 0, Monitor.Wait returns true when it should return false in IL2CPP. So we have to explicitly check for that value.
+                        waiter._didWaitSuccessfully = timeout != TimeSpan.Zero && Monitor.Wait(waiter, timeout);
                         Thread.MemoryBarrier(); // Make sure _didWait is written last.
                         waiter._didWait = true;
                         return waiter._didWaitSuccessfully;

ProtoPromise_Unity/Assets/Plugins/ProtoPromiseTests/Helpers/TestHelper.cs

@@ -1,4 +1,8 @@
-#if PROTO_PROMISE_DEBUG_ENABLE || (!PROTO_PROMISE_DEBUG_DISABLE && DEBUG)
+#if UNITY_5_5 || NET_2_0 || NET_2_0_SUBSET
+#define NET_LEGACY
+#endif
+
+#if PROTO_PROMISE_DEBUG_ENABLE || (!PROTO_PROMISE_DEBUG_DISABLE && DEBUG)
 #define PROMISE_DEBUG
 #else
 #undef PROMISE_DEBUG
@@ -99,6 +103,18 @@ public static void Setup()
                         {
                             try
                             {
+#if ENABLE_IL2CPP && !NET_LEGACY && !UNITY_2022_1_OR_NEWER
+                                // ExceptionDispatchInfo.Throw() generates a new Exception object instead of throwing the original object in IL2CPP, causing the Assert to fail.
+                                // This was fixed in Unity 2022. To avoid the tests failing, we instead have to check the object's type and message.
+                                if (s_expectedUncaughtRejectValue is Exception)
+                                {
+                                    Exception expected = (Exception) s_expectedUncaughtRejectValue;
+                                    Assert.AreEqual(expected.GetType(), e.Value.GetType());
+                                    Exception actual = (Exception) e.Value;
+                                    Assert.AreEqual(expected.Message, actual.Message);
+                                    return;
+                                }
+#endif
                                 Assert.AreEqual(s_expectedUncaughtRejectValue, e.Value);
                             }
                             catch (Exception ex)