Unity 2022.1.0a7 C# reference source code

Author: Unity Technologies

Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs

@@ -8,7 +8,6 @@ public class PackageInfo
     {
         public string Name;
         public string ResolvedPath;
-        public bool Immutable;
     }
 
     public class ConfigurationData

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -35,6 +35,7 @@ public class PlayerBuildConfig
         public bool GenerateIdeProject;
         public bool Development;
         public Services Services;
+        public string[] ManagedAssemblies;
         public StreamingAssetsFile[] StreamingAssetsFiles;
     }
 
@@ -47,7 +48,6 @@ public class LinkerConfig
     {
         public string[] LinkXmlFiles = new string[0];
         public string[] AssembliesToProcess = new string[0];
-        public string[] SearchDirectories = new string[0];
         public string EditorToLinkerData;
         public string Runtime;
         public string Profile;

Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs

@@ -7,6 +7,7 @@ namespace ScriptCompilationBuildProgram.Data
     public static class Constants
     {
         public const string ScriptAssembliesTarget = "ScriptAssemblies";
+        public const string ScriptAssembliesAndTypeDBTarget = "ScriptAssembliesAndTypeDB";
         public const string MovedFromExtension = "mvfrm";
     }
 
@@ -21,6 +22,11 @@ public class ScriptCompilationData
         public bool Debug;
         public string BuildTarget;
         public string Localization;
+        public string BuildPlayerDataOutput;
+        public bool ExtractRuntimeInitializeOnLoads;
+        public bool EnableDiagnostics;
+        public string[] AssembliesToScanForTypeDB;
+        public string[] SearchPaths;
     }
 
     public class AssemblyData
@@ -34,6 +40,7 @@ public class AssemblyData
         public string RuleSet;
         public string LanguageVersion;
         public bool UseDeterministicCompilation;
+        public bool SuppressCompilerWarnings;
         public string[] Analyzers = new string[0];
         public string Asmdef;
         public string[] BclDirectories = new string[0];

Editor/Mono/2D/SpriteAtlas/EditorSpriteAtlas.bindings.cs

@@ -13,6 +13,12 @@ namespace UnityEditor.U2D
     [NativeHeader("Editor/Src/2D/SpriteAtlas/SpriteAtlasPackingUtilities.h")]
     public class SpriteAtlasUtility
     {
+        [FreeFunction("SpriteAtlasExtensions::EnableV2Import")]
+        extern internal static void EnableV2Import(bool onOff);
+
+        [FreeFunction("SpriteAtlasExtensions::CleanupAtlasPacking")]
+        extern public static void CleanupAtlasPacking();
+
         [FreeFunction("CollectAllSpriteAtlasesAndPack")]
         extern public static void PackAllAtlases(BuildTarget target, bool canCancel = true);
 

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs

@@ -405,7 +405,9 @@ protected void ApplyRevertGUI()
                     if (GUILayout.Button("Pack Preview"))
                     {
                         GUI.FocusControl(null);
+                        SpriteAtlasUtility.EnableV2Import(true);
                         ApplyAndImport();
+                        SpriteAtlasUtility.EnableV2Import(false);
                         m_HasChanged = false;
                     }
                 }

Editor/Mono/Animation/AnimationWindow/AnimationWindowClipPopup.cs

@@ -214,7 +214,8 @@ private AnimationClip[] GetOrderedClipList()
             if (state.activeRootGameObject != null)
                 clips = AnimationUtility.GetAnimationClips(state.activeRootGameObject);
 
-            Array.Sort(clips, (AnimationClip clip1, AnimationClip clip2) => CurveUtility.GetClipName(clip1).CompareTo(CurveUtility.GetClipName(clip2)));
+            //Using AlphaNum/Natural Compare to sort clips
+            Array.Sort(clips, (AnimationClip clip1, AnimationClip clip2) => EditorUtility.NaturalCompareObjectNames(clip1, clip2));
 
             return clips;
         }

Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs

@@ -1026,6 +1026,7 @@ internal static AnimationClip CreateNewClipAtPath(string clipPath)
 
             if (asset)
             {
+                newClip.name = asset.name;
                 EditorUtility.CopySerialized(newClip, asset);
                 AssetDatabase.SaveAssets();
                 Object.DestroyImmediate(newClip);

Editor/Mono/Animation/AnimationWindow/CurveEditorWindow.cs

@@ -43,7 +43,8 @@ public enum NormalizationMode
         GUIContent m_GUIContent = new GUIContent();
 
         [SerializeField]
-        GUIView delegateView;
+        GUIView m_DelegateView;
+        internal GUIView delegateView => m_DelegateView;
 
         public const string CurveChangedCommand = "CurveChanged";
         public const string CurveChangeCompletedCommand = "CurveChangeCompleted";
@@ -269,7 +270,7 @@ private void RefreshShownCurves()
 
         public void Show(GUIView viewToUpdate, CurveEditorSettings settings)
         {
-            delegateView = viewToUpdate;
+            m_DelegateView = viewToUpdate;
             m_OnCurveChanged = null;
 
             Init(settings);
@@ -281,7 +282,7 @@ public void Show(GUIView viewToUpdate, CurveEditorSettings settings)
         public void Show(Action<AnimationCurve> onCurveChanged, CurveEditorSettings settings)
         {
             m_OnCurveChanged = onCurveChanged;
-            delegateView = null;
+            m_DelegateView = null;
 
             Init(settings);
             ShowAuxWindow();
@@ -451,7 +452,7 @@ void OnGUI()
         {
             bool gotMouseUp = (Event.current.type == EventType.MouseUp);
 
-            if (delegateView == null && m_OnCurveChanged == null)
+            if (m_DelegateView == null && m_OnCurveChanged == null)
                 m_Curve = null;
 
             if (ms_Styles == null)
@@ -576,11 +577,11 @@ private void DoUpdateCurve(bool exitGUI)
 
         void SendEvent(string eventName, bool exitGUI)
         {
-            if (delegateView)
+            if (m_DelegateView)
             {
                 Event e = EditorGUIUtility.CommandEvent(eventName);
                 Repaint();
-                delegateView.SendEvent(e);
+                m_DelegateView.SendEvent(e);
                 if (exitGUI)
                     GUIUtility.ExitGUI();
             }

Editor/Mono/Annotation/AnnotationUtility.bindings.cs

@@ -72,7 +72,11 @@ internal sealed partial class AnnotationUtility
 
         [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
         internal extern static float fadeGizmoSize { get; set; }
+
         [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
         internal extern static bool fadeGizmos { get; set; }
+
+        [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
+        internal extern static bool useInspectorExpandedState { get; set; }
     }
 }

Editor/Mono/AssemblyHelper.cs

@@ -17,6 +17,7 @@
 using UnityEditor.VisualStudioIntegration;
 using UnityEngine.Scripting;
 using Debug = UnityEngine.Debug;
+using Unity.Profiling;
 
 namespace UnityEditor
 {
@@ -420,5 +421,79 @@ internal static ICollection<string> FindAssemblies(string basePath, int maxDepth
 
             return assemblies;
         }
+
+        /// <summary>
+        /// Performs a depth-first-search topological sort on the input assemblies,
+        /// based on the outgoing assembly references from each assembly. The
+        /// returned list is sorted such that assembly A appears before any
+        /// assemblies that depend (directly or indirectly) on assembly A.
+        /// </summary>
+        internal static Assembly[] TopologicalSort(Assembly[] assemblies)
+        {
+            using var _ = new ProfilerMarker("SortAssembliesTopologically").Auto();
+
+            var assembliesByName = new Dictionary<string, int>(assemblies.Length);
+            for (var i = 0; i < assemblies.Length; i++)
+            {
+                assembliesByName[assemblies[i].GetName().Name] = i;
+            }
+
+            var result = new Assembly[assemblies.Length];
+            var resultIndex = 0;
+
+            var visited = new TopologicalSortVisitStatus[assemblies.Length];
+
+            void VisitAssembly(int index)
+            {
+                var visitStatus = visited[index];
+
+                switch (visitStatus)
+                {
+                    case TopologicalSortVisitStatus.Visiting:
+                        // We have a cyclic dependency between assemblies. This should really be an error, but...
+                        // We need to allow cyclic dependencies between assemblies, because the rest of Unity allows them.
+                        // For example if you make an assembly override for UnityEngine.AccessibilityModule.dll,
+                        // it will reference UnityEditor.CoreModule.dll, which in turn references
+                        // UnityEngine.AccessibilityModule.dll... and that doesn't trigger an error.
+                        // The topological sort won't be correct in this case, but it's better than erroring-out.
+                        break;
+
+                    case TopologicalSortVisitStatus.NotVisited:
+                        visited[index] = TopologicalSortVisitStatus.Visiting;
+
+                        var assembly = assemblies[index];
+
+                        var assemblyReferences = assembly.GetReferencedAssemblies();
+                        foreach (var assemblyReference in assemblyReferences)
+                        {
+                            // It's okay if we can't resolve the assembly. It just means that the referenced assembly
+                            // is not in the input set of assemblies, so we wouldn't be able to sort it anyway.
+                            if (assembliesByName.TryGetValue(assemblyReference.Name, out var referencedAssembly))
+                            {
+                                VisitAssembly(referencedAssembly);
+                            }
+                        }
+
+                        visited[index] = TopologicalSortVisitStatus.Visited;
+
+                        result[resultIndex++] = assembly;
+                        break;
+                }
+            }
+
+            for (var i = 0; i < assemblies.Length; i++)
+            {
+                VisitAssembly(i);
+            }
+
+            return result;
+        }
+
+        private enum TopologicalSortVisitStatus : byte
+        {
+            NotVisited,
+            Visiting,
+            Visited
+        }
     }
 }