From 7d31299b5c9983cecb1e0b5354dccef64ff2f33d Mon Sep 17 00:00:00 2001 From: Kochoyume <78918084+kochounoyume@users.noreply.github.com> Date: Thu, 25 Jan 2024 01:02:57 +0900 Subject: [PATCH] Fix conditional compilation to work with .NET Framework --- .../Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs | 8 ++++---- .../Assets/Plugins/UniTask/Runtime/UniTask.AsValueTask.cs | 2 +- src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs index 5ef6112..11da924 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs @@ -19,7 +19,7 @@ namespace Cysharp.Threading.Tasks // similar as IValueTaskSource public interface IUniTaskSource -#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0 +#if !UNITY_2018_3_OR_NEWER && UNITY_2021_2_OR_NEWER && !NETSTANDARD2_0 : System.Threading.Tasks.Sources.IValueTaskSource #pragma warning disable CS0108 #endif @@ -30,7 +30,7 @@ namespace Cysharp.Threading.Tasks UniTaskStatus UnsafeGetStatus(); // only for debug use. -#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0 +#if !UNITY_2018_3_OR_NEWER && UNITY_2021_2_OR_NEWER && !NETSTANDARD2_0 #pragma warning restore CS0108 System.Threading.Tasks.Sources.ValueTaskSourceStatus System.Threading.Tasks.Sources.IValueTaskSource.GetStatus(short token) @@ -53,13 +53,13 @@ namespace Cysharp.Threading.Tasks } public interface IUniTaskSource : IUniTaskSource -#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0 +#if !UNITY_2018_3_OR_NEWER && UNITY_2021_2_OR_NEWER && !NETSTANDARD2_0 , System.Threading.Tasks.Sources.IValueTaskSource #endif { new T GetResult(short token); -#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0 +#if !UNITY_2018_3_OR_NEWER && UNITY_2021_2_OR_NEWER && !NETSTANDARD2_0 new public UniTaskStatus GetStatus(short token) { diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.AsValueTask.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.AsValueTask.cs index bc9b0fb..8c5355b 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.AsValueTask.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.AsValueTask.cs @@ -1,4 +1,4 @@ -#if !UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER +#if !UNITY_2018_3_OR_NEWER && UNITY_2021_2_OR_NEWER #pragma warning disable 0649 using System; diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.cs index e296e62..2f925fc 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.cs @@ -69,7 +69,7 @@ namespace Cysharp.Threading.Tasks return new UniTask(new IsCanceledSource(source), token); } -#if !UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER +#if !UNITY_2018_3_OR_NEWER && UNITY_2021_2_OR_NEWER public static implicit operator System.Threading.Tasks.ValueTask(in UniTask self) { @@ -440,7 +440,7 @@ namespace Cysharp.Threading.Tasks return self.AsUniTask(); } -#if !UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER +#if !UNITY_2018_3_OR_NEWER && UNITY_2021_2_OR_NEWER public static implicit operator System.Threading.Tasks.ValueTask(in UniTask self) {