Migrate AppDomain.GetAssemblies() to CurrentAssemblies.GetLoadedAssemblies()

Author: MiroBrodlovaUnityGit

Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs

@@ -4,6 +4,9 @@
 using System.Collections.Generic;
 using UnityEngine.Experimental.Rendering;
 using System.Runtime.CompilerServices;
+#if UNITY_6000_5_OR_NEWER
+using UnityEngine.Assemblies;
+#endif
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -1349,7 +1352,11 @@ public static IEnumerable<Type> GetAllAssemblyTypes()
                 return s_AssemblyTypes;
 
             var typeList = new List<Type>();
+#if UNITY_6000_5_OR_NEWER
+            foreach (var assembly in CurrentAssemblies.GetLoadedAssemblies())
+#else
             foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+#endif
             {
                 try
                 {

Packages/com.unity.render-pipelines.core/Tests/Editor/ReflectionUtils.cs

@@ -3,6 +3,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+#if UNITY_6000_5_OR_NEWER
+using UnityEngine.Assemblies;
+#endif
 
 namespace UnityEngine.Rendering.Tests
 {
@@ -18,8 +21,12 @@ public static class ReflectionUtils
         /// <returns>The found type</returns>
         public static Type FindTypeByName(string name)
         {
+#if UNITY_6000_5_OR_NEWER
+            var type = CurrentAssemblies.GetLoadedAssemblies()
+#else
             var type = AppDomain.CurrentDomain
                 .GetAssemblies()
+#endif
                 .Select(assembly => assembly.GetType(name))
                 .FirstOrDefault(tt => tt != null);
 

Packages/com.unity.render-pipelines.high-definition/Editor/Material/LTCAreaLight/LTCTableGeneratorEditor.cs

@@ -4,6 +4,9 @@
 using System.IO;
 using UnityEditor;
 using System.Linq;
+#if UNITY_6000_5_OR_NEWER
+using UnityEngine.Assemblies;
+#endif
 
 namespace UnityEngine.Rendering.HighDefinition.LTC
 {
@@ -35,7 +38,11 @@ static Type[] ListAllBRDFTypes()
             // This function lists all the classes that implement the interface IBSDF
             List<Type> types = new List<Type>();
             Type searchInterface = typeof(IBRDF);
+#if UNITY_6000_5_OR_NEWER
+            return CurrentAssemblies.GetLoadedAssemblies()
+#else
             return AppDomain.CurrentDomain.GetAssemblies()
+#endif
                 .SelectMany(s => s.GetTypes())
                 .Where(p => searchInterface.IsAssignableFrom(p) && !p.IsInterface).ToArray();
         }

Packages/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs

@@ -13,6 +13,9 @@
 using System.Reflection;
 using System.Runtime.Remoting.Metadata.W3cXsd2001;
 using UnityEditor.ProjectWindowCallback;
+#if UNITY_6000_5_OR_NEWER
+using UnityEngine.Assemblies;
+#endif
 using UnityEditor.ShaderGraph.Internal;
 using UnityEngine;
 using UnityEngine.Rendering;
@@ -336,7 +339,11 @@ static void Visit(List<AbstractMaterialNode> outputList, Dictionary<string, Abst
             if (s_LegacyTypeRemapping == null)
             {
                 s_LegacyTypeRemapping = new Dictionary<SerializationHelper.TypeSerializationInfo, SerializationHelper.TypeSerializationInfo>();
+#if UNITY_6000_5_OR_NEWER
+                foreach (var assembly in CurrentAssemblies.GetLoadedAssemblies())
+#else
                 foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+#endif
                 {
                     foreach (var type in assembly.GetTypesOrNothing())
                     {

Packages/com.unity.shadergraph/Editor/Data/Util/SerializationHelper.cs

@@ -4,6 +4,9 @@
 using System.Reflection;
 using UnityEditor.ShaderGraph.Serialization;
 using UnityEngine;
+#if UNITY_6000_5_OR_NEWER
+using UnityEngine.Assemblies;
+#endif
 
 namespace UnityEditor.Graphing
 {
@@ -52,7 +55,11 @@ static Type GetTypeFromSerializedString(TypeSerializationInfo typeInfo)
             if (!typeInfo.IsValid())
                 return null;
 
+#if UNITY_6000_5_OR_NEWER
+            var assemblies = CurrentAssemblies.GetLoadedAssemblies();
+#else
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+#endif
             foreach (var assembly in assemblies)
             {
                 var type = assembly.GetType(typeInfo.fullName);

Packages/com.unity.shadergraph/Editor/Drawing/Inspector/MasterPreviewView.cs

@@ -10,6 +10,9 @@
 
 using UnityEditor.UIElements;
 using UnityEngine.UIElements;
+#if UNITY_6000_5_OR_NEWER
+using UnityEngine.Assemblies;
+#endif
 
 namespace UnityEditor.ShaderGraph.Drawing.Inspector
 {
@@ -42,7 +45,11 @@ public VisualElement preview
         }
 
         List<string> m_DoNotShowPrimitives = new List<string>(new string[] { PrimitiveType.Plane.ToString() });
+#if UNITY_6000_5_OR_NEWER
+        static Type s_ObjectSelector = CurrentAssemblies.GetLoadedAssemblies().SelectMany(x => x.GetTypesOrNothing()).FirstOrDefault(t => t.FullName == "UnityEditor.ObjectSelector");
+#else
         static Type s_ObjectSelector = AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypesOrNothing()).FirstOrDefault(t => t.FullName == "UnityEditor.ObjectSelector");
+#endif
 
         public string assetName
         {

Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs

@@ -13,6 +13,9 @@
 using UnityEditor.ShaderGraph.Serialization;
 using UnityEngine.UIElements;
 using Edge = UnityEditor.Experimental.GraphView.Edge;
+#if UNITY_6000_5_OR_NEWER
+using UnityEngine.Assemblies;
+#endif
 using Node = UnityEditor.Experimental.GraphView.Node;
 using UnityEngine.Pool;
 
@@ -38,7 +41,11 @@ public MaterialGraphView()
 
             // Get reference to GraphView assembly
             Assembly graphViewAssembly = null;
+#if UNITY_6000_5_OR_NEWER
+            foreach (var assembly in CurrentAssemblies.GetLoadedAssemblies())
+#else
             foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+#endif
             {
                 var assemblyName = assembly.GetName().ToString();
                 if (assemblyName.Contains("GraphView"))