From e213305fc8cd0341a697c266c6ec77c1712f0c17 Mon Sep 17 00:00:00 2001
From: Koji Hasegawa <hasegawa@hubsys.co.jp>
Date: Mon, 6 Jan 2025 03:13:02 +0900
Subject: [PATCH 1/2] Fix return type to AsyncOperation

---
 RuntimeInternals/SceneManagerHelper.cs           | 7 +++----
 Tests/RuntimeInternals/SceneManagerHelperTest.cs | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/RuntimeInternals/SceneManagerHelper.cs b/RuntimeInternals/SceneManagerHelper.cs
index 3f7a3d2..2a1a4a1 100644
--- a/RuntimeInternals/SceneManagerHelper.cs
+++ b/RuntimeInternals/SceneManagerHelper.cs
@@ -1,8 +1,7 @@
-// Copyright (c) 2023-2024 Koji Hasegawa.
+// Copyright (c) 2023-2025 Koji Hasegawa.
 // This software is released under the MIT License.
 
 using System;
-using System.Collections;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
@@ -42,7 +41,7 @@ public static class SceneManagerHelper
         /// When loading the scene that is not in "Scenes in Build", use <see cref="TestHelper.Attributes.BuildSceneAttribute"/>.
         /// </remarks>
         [SuppressMessage("ReSharper", "InvalidXmlDocComment")]
-        public static IEnumerator LoadSceneAsync(
+        public static AsyncOperation LoadSceneAsync(
             string path,
             LoadSceneMode mode = LoadSceneMode.Single,
             LocalPhysicsMode physicsMode = LocalPhysicsMode.None,
@@ -74,7 +73,7 @@ public static IEnumerator LoadSceneAsync(
                     new LoadSceneParameters(mode, physicsMode));
             }
 
-            yield return loadSceneAsync;
+            return loadSceneAsync;
         }
 
         /// <summary>
diff --git a/Tests/RuntimeInternals/SceneManagerHelperTest.cs b/Tests/RuntimeInternals/SceneManagerHelperTest.cs
index ffe3e6a..4352067 100644
--- a/Tests/RuntimeInternals/SceneManagerHelperTest.cs
+++ b/Tests/RuntimeInternals/SceneManagerHelperTest.cs
@@ -1,9 +1,8 @@
-// Copyright (c) 2023-2024 Koji Hasegawa.
+// Copyright (c) 2023-2025 Koji Hasegawa.
 // This software is released under the MIT License.
 
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Cysharp.Threading.Tasks;
 using NUnit.Framework;
 using UnityEngine;
 using UnityEngine.TestTools;

From 1e50aeb91bf5c7064b18871a1d376f2e22bb7efb Mon Sep 17 00:00:00 2001
From: Koji Hasegawa <hasegawa@hubsys.co.jp>
Date: Mon, 6 Jan 2025 03:41:03 +0900
Subject: [PATCH 2/2] Revert using UniTask

---
 Tests/RuntimeInternals/SceneManagerHelperTest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Tests/RuntimeInternals/SceneManagerHelperTest.cs b/Tests/RuntimeInternals/SceneManagerHelperTest.cs
index 4352067..ffe3e6a 100644
--- a/Tests/RuntimeInternals/SceneManagerHelperTest.cs
+++ b/Tests/RuntimeInternals/SceneManagerHelperTest.cs
@@ -1,8 +1,9 @@
-// Copyright (c) 2023-2025 Koji Hasegawa.
+// Copyright (c) 2023-2024 Koji Hasegawa.
 // This software is released under the MIT License.
 
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Cysharp.Threading.Tasks;
 using NUnit.Framework;
 using UnityEngine;
 using UnityEngine.TestTools;