diff --git a/AssetIdRemapUtility/Editor/PackageImporter.cs b/AssetIdRemapUtility/Editor/PackageImporter.cs index 8a9c76f6f..b0067be3e 100644 --- a/AssetIdRemapUtility/Editor/PackageImporter.cs +++ b/AssetIdRemapUtility/Editor/PackageImporter.cs @@ -4,6 +4,9 @@ using System.Text; using UnityEditor; using UnityEngine; +#if UNITY_6000_5_OR_NEWER +using UnityEngine.Assemblies; +#endif namespace UnityEngine.ProBuilder.AssetIdRemapUtility { @@ -133,7 +136,11 @@ internal static bool IsPreProBuilder4InProject() internal static bool IsProBuilder4OrGreaterLoaded() { +#if UNITY_6000_5_OR_NEWER + return CurrentAssemblies.GetLoadedAssemblies().Any(x => x.ToString().Contains("Unity.ProBuilder")); +#else return AppDomain.CurrentDomain.GetAssemblies().Any(x => x.ToString().Contains("Unity.ProBuilder")); +#endif } } } diff --git a/Editor/EditorCore/EditorToolbarLoader.cs b/Editor/EditorCore/EditorToolbarLoader.cs index 317773d7a..a2801762c 100644 --- a/Editor/EditorCore/EditorToolbarLoader.cs +++ b/Editor/EditorCore/EditorToolbarLoader.cs @@ -3,6 +3,9 @@ using UnityEngine.ProBuilder; using System.Linq; using System.Reflection; +#if UNITY_6000_5_OR_NEWER +using UnityEngine.Assemblies; +#endif namespace UnityEditor.ProBuilder { @@ -132,7 +135,11 @@ internal static List GetActions(bool forceReload = false) static void SearchForMenuAttributes(List list) { +#if UNITY_6000_5_OR_NEWER + foreach (var assembly in CurrentAssemblies.GetLoadedAssemblies()) +#else foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) +#endif { try { diff --git a/Editor/EditorCore/ReflectionUtility.cs b/Editor/EditorCore/ReflectionUtility.cs index f98d5677f..069ceac40 100644 --- a/Editor/EditorCore/ReflectionUtility.cs +++ b/Editor/EditorCore/ReflectionUtility.cs @@ -4,6 +4,9 @@ using System.Reflection; using System.Collections.Generic; using UnityEngine.ProBuilder; +#if UNITY_6000_5_OR_NEWER +using UnityEngine.Assemblies; +#endif namespace UnityEditor.ProBuilder { @@ -37,7 +40,11 @@ public static Type GetType(string type, string assembly = null) if (t == null) { +#if UNITY_6000_5_OR_NEWER + IEnumerable assemblies = CurrentAssemblies.GetLoadedAssemblies(); +#else IEnumerable assemblies = AppDomain.CurrentDomain.GetAssemblies(); +#endif if (assembly != null) assemblies = assemblies.Where(x => x.FullName.Contains(assembly));