Skip to content

fix warning: use unity 6 api when compiling for unity 6 #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

fix warning: use unity 6 api when compiling for unity 6 #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion UnityProject/Assets/Plugins/Zenject/Source/Install/Contexts/ProjectContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,13 @@ static void InstantiateAndInitialize()
ProfileBlock.UnityMainThread = Thread.CurrentThread;
#endif

#if UNITY_6000
Assert.That(FindObjectsByType<ProjectContext>(FindObjectsSortMode.None).IsEmpty(),
"Tried to create multiple instances of ProjectContext!");
#else
Assert.That(FindObjectsOfType<ProjectContext>().IsEmpty(),
"Tried to create multiple instances of ProjectContext!");

#endif
var prefab = TryGetPrefab();

var prefabWasActive = false;
Expand Down
5 changes: 5 additions & 0 deletions UnityProject/Assets/Plugins/Zenject/Source/Util/UnityUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,12 @@ public static IEnumerable<GameObject> GetDirectChildren(GameObject obj)

public static IEnumerable<GameObject> GetAllGameObjects()
{
#if UNITY_6000
return Object.FindObjectsByType<Transform>(FindObjectsSortMode.None)
.Select(x => x.gameObject);
#else
return GameObject.FindObjectsOfType<Transform>().Select(x => x.gameObject);
#endif
}

public static List<GameObject> GetAllRootGameObjects()
Expand Down