Don't introduce GetAwaiter extension methods conflicting with Unity's Awaitable in 2023.1+ (#11178)

simonferquel · web-flow · commit a27545e4af0a · 2022-11-09T16:16:10.000-08:00
Signed-off-by: Simon Ferquel &lt;simon.ferquel@unity3d.com&gt;

Signed-off-by: Simon Ferquel &lt;simon.ferquel@unity3d.com&gt;
diff --git a/Assets/MRTK/Core/Utilities/Async/AwaiterExtensions.cs b/Assets/MRTK/Core/Utilities/Async/AwaiterExtensions.cs
@@ -76,6 +76,7 @@ public static SimpleCoroutineAwaiter GetAwaiter(this WaitWhile instruction)
             return GetAwaiterReturnVoid(instruction);
         }
 
+#if !UNITY_2023_1_OR_NEWER
         public static SimpleCoroutineAwaiter<AsyncOperation> GetAwaiter(this AsyncOperation instruction)
         {
             return GetAwaiterReturnSelf(instruction);
@@ -104,6 +105,7 @@ public static SimpleCoroutineAwaiter<Object> GetAwaiter(this AssetBundleRequest
                 InstructionWrappers.AssetBundleRequest(awaiter, instruction)));
             return awaiter;
         }
+#endif
 
         public static SimpleCoroutineAwaiter<T> GetAwaiter<T>(this IEnumerator<T> coroutine)
         {

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public static SimpleCoroutineAwaiter GetAwaiter(this WaitWhile instruction)`
`76`	`76`	`return GetAwaiterReturnVoid(instruction);`
`77`	`77`	`}`
`78`	`78`
	`79`	`+#if !UNITY_2023_1_OR_NEWER`
`79`	`80`	`public static SimpleCoroutineAwaiter<AsyncOperation> GetAwaiter(this AsyncOperation instruction)`
`80`	`81`	`{`
`81`	`82`	`return GetAwaiterReturnSelf(instruction);`
`@@ -104,6 +105,7 @@ public static SimpleCoroutineAwaiter<Object> GetAwaiter(this AssetBundleRequest`
`104`	`105`	`InstructionWrappers.AssetBundleRequest(awaiter, instruction)));`
`105`	`106`	`return awaiter;`
`106`	`107`	`}`
	`108`	`+#endif`
`107`	`109`
`108`	`110`	`public static SimpleCoroutineAwaiter<T> GetAwaiter<T>(this IEnumerator<T> coroutine)`
`109`	`111`	`{`