diff --git a/Assembly-CSharp-firstpass-vs.csproj b/Assembly-CSharp-firstpass-vs.csproj index 5d53dbb4..36fda04c 100644 --- a/Assembly-CSharp-firstpass-vs.csproj +++ b/Assembly-CSharp-firstpass-vs.csproj @@ -379,7 +379,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/Assembly-CSharp-firstpass.Player.csproj b/Assembly-CSharp-firstpass.Player.csproj index 71cb0cac..2206f036 100644 --- a/Assembly-CSharp-firstpass.Player.csproj +++ b/Assembly-CSharp-firstpass.Player.csproj @@ -896,7 +896,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/Assembly-CSharp-firstpass.csproj b/Assembly-CSharp-firstpass.csproj index 88739c8a..03a06a35 100644 --- a/Assembly-CSharp-firstpass.csproj +++ b/Assembly-CSharp-firstpass.csproj @@ -676,7 +676,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj index 4f8cc105..a61f89a6 100644 --- a/Assembly-CSharp-vs.csproj +++ b/Assembly-CSharp-vs.csproj @@ -83,7 +83,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/Assembly-CSharp.Player.csproj b/Assembly-CSharp.Player.csproj index 61ff895a..026d8474 100644 --- a/Assembly-CSharp.Player.csproj +++ b/Assembly-CSharp.Player.csproj @@ -910,7 +910,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index a37af0c2..45b6eb09 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -680,7 +680,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/Assets/Plugins/UniRx/Scripts/Async/EnumeratorAsyncExtensions.cs b/Assets/Plugins/UniRx/Scripts/Async/EnumeratorAsyncExtensions.cs index cd73690c..e564cd32 100644 --- a/Assets/Plugins/UniRx/Scripts/Async/EnumeratorAsyncExtensions.cs +++ b/Assets/Plugins/UniRx/Scripts/Async/EnumeratorAsyncExtensions.cs @@ -1,4 +1,4 @@ -#if (NET_4_6 || NET_STANDARD_2_0) && UNITY_2018_1_OR_NEWER +#if CSHARP_7_OR_LATER #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System; diff --git a/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.Jobs.cs b/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.Jobs.cs index 1b3b0dc1..e3cd2563 100644 --- a/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.Jobs.cs +++ b/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.Jobs.cs @@ -1,4 +1,4 @@ -#if UNITY_2018_1_OR_NEWER && (NET_4_6 || NET_STANDARD_2_0 || CSHARP_7_OR_LATER) && !UNITY_WSA +#if CSHARP_7_OR_LATER #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System; diff --git a/Assets/Scripts/RuntimeUnitTestToolkit/UnitTest.unity b/Assets/Scripts/RuntimeUnitTestToolkit/UnitTest.unity index 2412348c..1cef2b4f 100644 --- a/Assets/Scripts/RuntimeUnitTestToolkit/UnitTest.unity +++ b/Assets/Scripts/RuntimeUnitTestToolkit/UnitTest.unity @@ -511,8 +511,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.25, y: -634.5} - m_SizeDelta: {x: 414.5, y: 1269} + m_AnchoredPosition: {x: 198, y: -400} + m_SizeDelta: {x: 396, y: 800} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1264454900 MonoBehaviour: @@ -587,8 +587,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 202.25, y: -30} - m_SizeDelta: {x: 384.5, y: 40} + m_AnchoredPosition: {x: 193, y: -30} + m_SizeDelta: {x: 366, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1337584758 MonoBehaviour: @@ -925,7 +925,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 15, y: 0} - m_SizeDelta: {x: -15, y: -1242} + m_SizeDelta: {x: -15, y: -773} m_Pivot: {x: 0, y: 1} --- !u!114 &1607029148 MonoBehaviour: @@ -1108,7 +1108,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -1209} + m_SizeDelta: {x: 0, y: -740} m_Pivot: {x: 0, y: 1} --- !u!114 &1903152287 MonoBehaviour: @@ -1187,8 +1187,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 631.75, y: -634.5} - m_SizeDelta: {x: 414.5, y: 1269} + m_AnchoredPosition: {x: 604, y: -400} + m_SizeDelta: {x: 396, y: 800} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2044738991 MonoBehaviour: diff --git a/Assets/Scripts/Tests/_AsyncTest.cs b/Assets/Scripts/Tests/_AsyncTest.cs index f19f2318..9a3b490e 100644 --- a/Assets/Scripts/Tests/_AsyncTest.cs +++ b/Assets/Scripts/Tests/_AsyncTest.cs @@ -240,6 +240,24 @@ public async UniTask ExceptionlessCancellation() canceled.IsTrue(); } + public async UniTask ExceptionCancellation() + { + var cts = new CancellationTokenSource(); + + UniTask.DelayFrame(10).ContinueWith(_ => cts.Cancel()).Forget(); + + bool occur = false; + try + { + var value = await UniTask.DelayFrame(100, cancellationToken: cts.Token); + } + catch (OperationCanceledException ex) + { + occur = true; + } + occur.IsTrue(); + } + IEnumerator ToaruCoroutineEnumerator() { yield return null; diff --git a/NewAssembly.csproj b/NewAssembly.csproj index a45eba3c..2a8817f3 100644 --- a/NewAssembly.csproj +++ b/NewAssembly.csproj @@ -707,7 +707,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/UniRx.Async.Player.csproj b/UniRx.Async.Player.csproj index 5f012fff..fd1011c4 100644 --- a/UniRx.Async.Player.csproj +++ b/UniRx.Async.Player.csproj @@ -912,7 +912,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/UniRx.Async.csproj b/UniRx.Async.csproj index 1427aa38..5b2a177c 100644 --- a/UniRx.Async.csproj +++ b/UniRx.Async.csproj @@ -744,7 +744,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/UniRx.Player.csproj b/UniRx.Player.csproj index aa0242de..106b9ea6 100644 --- a/UniRx.Player.csproj +++ b/UniRx.Player.csproj @@ -1074,7 +1074,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/UniRx.Plugins.Player.csproj b/UniRx.Plugins.Player.csproj index f6704257..ee341716 100644 --- a/UniRx.Plugins.Player.csproj +++ b/UniRx.Plugins.Player.csproj @@ -937,7 +937,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/UniRx.Plugins.csproj b/UniRx.Plugins.csproj index d4ac98e6..e95be8a1 100644 --- a/UniRx.Plugins.csproj +++ b/UniRx.Plugins.csproj @@ -700,7 +700,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file diff --git a/UniRx.csproj b/UniRx.csproj index 5e74b122..ca161df2 100644 --- a/UniRx.csproj +++ b/UniRx.csproj @@ -904,7 +904,7 @@ true C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin - 41588 + 5746 true \ No newline at end of file