Unity 6000.0.3f1 C# reference source code

Author: Unity Technologies

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -20,11 +20,6 @@ namespace UnityEditor;
 
 sealed class AudioContainerWindow : EditorWindow
 {
-    /// <summary>
-    /// The cached instance of the window, if it is open.
-    /// </summary>
-    internal static AudioContainerWindow Instance { get; private set; }
-
     internal readonly AudioContainerWindowState State = new();
 
     /// <summary>
@@ -121,15 +116,13 @@ static void OnCreateButtonClicked()
 
     void OnEnable()
     {
-        Instance = this;
         m_DiceIconOff = EditorGUIUtility.IconContent("AudioRandomContainer On Icon").image as Texture2D;
         m_DiceIconOn = EditorGUIUtility.IconContent("AudioRandomContainer Icon").image as Texture2D;
         SetTitle();
     }
 
     void OnDisable()
     {
-        Instance = null;
         State.OnDestroy();
         UnsubscribeFromGUICallbacksAndEvents();
         m_IsInitializing = false;
@@ -139,7 +132,7 @@ void OnDisable()
         m_AddedElements.Clear();
     }
 
-    private void OnFocus()
+    void OnFocus()
     {
         if (State.AudioContainer != null)
         {
@@ -1365,8 +1358,18 @@ class AudioContainerModificationProcessor : AssetModificationProcessor
         /// </summary>
         static string[] OnWillSaveAssets(string[] paths)
         {
-            if (Instance != null)
-                Instance.OnWillSaveAssets(paths);
+            if (HasOpenInstances<AudioContainerWindow>())
+            {
+                var window = focusedWindow as AudioContainerWindow;
+
+                if (window == null)
+                {
+                    // The window is not focused, so make sure we don't focus when getting the reference here.
+                    window = GetWindow<AudioContainerWindow>(false, null, false);
+                }
+
+                window.OnWillSaveAssets(paths);
+            }
 
             return paths;
         }
@@ -1381,17 +1384,25 @@ class AudioContainerPostProcessor : AssetPostprocessor
         /// </summary>
         static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssets)
         {
-            if (Instance == null)
-                return;
+            if (HasOpenInstances<AudioContainerWindow>())
+            {
+                var window = focusedWindow as AudioContainerWindow;
 
-            if (movedFromAssets.Length > 0)
-                Instance.OnAssetsMoved(movedFromAssets);
+                if (window == null)
+                {
+                    // The window is not focused, so make sure we don't focus when getting the reference here.
+                    window = GetWindow<AudioContainerWindow>(false, null, false);
+                }
+
+                if (movedFromAssets.Length > 0)
+                    window.OnAssetsMoved(movedFromAssets);
 
-            if (importedAssets.Length > 0)
-                Instance.OnAssetsImported(importedAssets);
+                if (importedAssets.Length > 0)
+                    window.OnAssetsImported(importedAssets);
 
-            if (deletedAssets.Length > 0)
-                Instance.OnAssetsDeleted(deletedAssets);
+                if (deletedAssets.Length > 0)
+                    window.OnAssetsDeleted(deletedAssets);
+            }
         }
     }
 

Editor/Mono/Audio/AudioContainerWindowState.cs

@@ -5,7 +5,6 @@
 using System;
 using UnityEditor.UIElements;
 using UnityEngine;
-using UnityEngine.Assertions;
 using UnityEngine.Audio;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
@@ -211,7 +210,7 @@ void OnResourceChanged(SerializedProperty property)
         UpdateResourceTrackerElement();
     }
 
-    private void UpdateResourceTrackerElement()
+    void UpdateResourceTrackerElement()
     {
         if (m_ResourceTrackerElement != null)
         {

Editor/Mono/BuildPlayerWindow.cs

@@ -371,7 +371,9 @@ void ActiveBuildTargetsGUI()
                         continue;
 
                     // Some build targets are only compatible with specific OS
-                    if (BuildTargetDiscovery.TryGetBuildTarget(gt.defaultTarget, out IBuildTarget iBuildTarget) && !(iBuildTarget.BuildPlatformProperties?.CanBuildOnCurrentHostPlatform ?? true))
+#pragma warning disable CS0618 // Member is obsolete
+                    if (!BuildTargetDiscovery.BuildPlatformIsAvailableOnHostPlatform(gt.defaultTarget, SystemInfo.operatingSystemFamily))
+#pragma warning restore CS0618
                         continue;
 
                     GUI.contentColor = gt.installed ? Color.white : new Color(1, 1, 1, 0.5f);

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -267,12 +267,8 @@ internal List<string> GetMissingKnownPlatformModules()
                 if (BuildProfileModuleUtil.IsModuleInstalled(key))
                     continue;
 
-                // Some build targets are only compatible with specific OS,
-                // from BuildPlayerWindow.ActiveBuildTargetsGUI()
-                var buildTarget = BuildProfileModuleUtil.GetBuildTargetAndSubtarget(key).Item1;
-                var iBuildTarget = ModuleManager.GetIBuildTarget(buildTarget);
-                if (iBuildTarget != null
-                    && !(iBuildTarget.BuildPlatformProperties?.CanBuildOnCurrentHostPlatform ?? true))
+                // Some build targets are only compatible with specific OS
+                if (!BuildTargetDiscovery.BuildPlatformIsAvailableOnHostPlatform(new GUID(key), SystemInfo.operatingSystemFamily))
                     continue;
 
                 missingPlatforms.Add(key);
@@ -281,6 +277,15 @@ internal List<string> GetMissingKnownPlatformModules()
             return missingPlatforms;
         }
 
+        /// <summary>
+        /// Check if there's an active build profile with player settings
+        /// </summary>
+        static internal bool ProjectHasActiveProfileWithPlayerSettings()
+        {
+            var activeBuildProfile = BuildProfile.GetActiveBuildProfile();
+            return activeBuildProfile?.playerSettings != null;
+        }
+
         /// <summary>
         /// Sync the active build profile to EditorUserBuildSettings to ensure they are in a consistent state.
         /// </summary>

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -230,9 +230,10 @@ internal static BuildPlayerOptions GetBuildPlayerOptionsFromActiveProfile(string
             if (activeProfile == null)
                 throw new ArgumentException("Active build profile is null.");
 
-            BuildTarget buildTarget = activeProfile.buildTarget;
-            BuildTargetGroup buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
-            int subtarget = EditorUserBuildSettings.GetActiveSubtargetFor(buildTarget);
+            var buildTarget = activeProfile.buildTarget;
+            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
+            int subtarget = IsStandalonePlatform(buildTarget) ?
+                (int)activeProfile.subtarget : EditorUserBuildSettings.GetActiveSubtargetFor(buildTarget);
 
             options.options = GetBuildOptions(buildTarget, buildTargetGroup, buildLocation, customBuildOptions);
             options.target = buildTarget;

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -120,7 +120,7 @@ public static bool TryGetBuildTarget(BuildTarget platform, out IBuildTarget buil
             return buildTarget != null;
         }
 
-        public static bool TryGetProperties<T>(BuildTarget platform, out T properties) where T: IPlatformProperties
+        public static bool TryGetProperties<T>(BuildTarget platform, out T properties) where T : IPlatformProperties
         {
             if (TryGetBuildTarget(platform, out var buildTarget))
             {
@@ -255,6 +255,24 @@ internal static bool DoesBuildTargetSupportSinglePassStereoRendering(BuildTarget
             s_platform_102,
         };
 
+        static GUID[] WindowsARM64BuildTargets { get; } = new GUID[]
+        {
+            s_platform_02,
+            s_platform_05,
+            s_platform_09,
+            s_platform_13,
+            s_platform_20,
+            s_platform_21,
+            s_platform_24,
+            s_platform_37,
+            s_platform_41,
+            s_platform_46,
+            s_platform_47,
+            s_platform_100,
+            s_platform_101,
+            s_platform_102,
+        };
+
         static GUID[] MacBuildTargets { get; } = new GUID[]
         {
             s_platform_02,
@@ -490,7 +508,7 @@ static BuildTargetDiscovery()
 
         public static GUID GetGUIDFromBuildTarget(BuildTarget buildTarget)
         {
-            if(s_PlatformGUIDData.TryGetValue(buildTarget, out GUID value))
+            if (s_PlatformGUIDData.TryGetValue(buildTarget, out GUID value))
                 return value;
 
             return new GUID("");
@@ -615,53 +633,40 @@ public static bool BuildPlatformIsInstalled(GUID platformGuid)
         }
 
         [System.Obsolete("BuildPlatformIsAvailableOnHostPlatform(BuildTarget) is obsolete. Use BuildPlatformIsAvailableOnHostPlatform(IBuildTarget) instead.", false)]
+        public static bool BuildPlatformIsAvailableOnHostPlatform(BuildTarget platform, UnityEngine.OperatingSystemFamily hostPlatform) => BuildPlatformIsAvailableOnHostPlatform(GetGUIDFromBuildTarget(platform), hostPlatform);
+        public static bool BuildPlatformIsAvailableOnHostPlatform(IBuildTarget platform, UnityEngine.OperatingSystemFamily hostPlatform) => BuildPlatformIsAvailableOnHostPlatform(platform.Guid, hostPlatform);
 
-        public static bool BuildPlatformIsAvailableOnHostPlatform(BuildTarget platform, UnityEngine.OperatingSystemFamily hostPlatform)
+        public static bool BuildPlatformIsAvailableOnHostPlatform(GUID platformGuid, UnityEngine.OperatingSystemFamily hostPlatform)
         {
-            var platformGuid = GetGUIDFromBuildTarget(platform);
+            var platformTargetArray = WindowsBuildTargets;
 
-            if (hostPlatform == UnityEngine.OperatingSystemFamily.Windows)
-            {
-                foreach (var winTarget in WindowsBuildTargets)
-                    if (winTarget == platformGuid)
-                        return true;
-            }
+            if (hostPlatform == UnityEngine.OperatingSystemFamily.Windows && IsWindowsArm64Architecture())
+                platformTargetArray = WindowsARM64BuildTargets;
             else if (hostPlatform == UnityEngine.OperatingSystemFamily.MacOSX)
-            {
-                foreach (var macTarget in MacBuildTargets)
-                    if (macTarget == platformGuid)
-                        return true;
-            }
+                platformTargetArray = MacBuildTargets;
             else if (hostPlatform == UnityEngine.OperatingSystemFamily.Linux)
-            {
-                foreach (var linuxTarget in LinuxBuildTargets)
-                    if (linuxTarget == platformGuid)
-                        return true;
-            }
+                platformTargetArray = LinuxBuildTargets;
+
+            foreach (var platformTarget in platformTargetArray)
+                if (platformTarget == platformGuid)
+                    return true;
+
             return false;
         }
-        public static bool BuildPlatformIsAvailableOnHostPlatform(IBuildTarget platform, UnityEngine.OperatingSystemFamily hostPlatform)
-        {
-            // TODO: PLAT-8695 - Consoles are available only on x64 Windows. They can't build on Arm64. Windows.x64 and arm64 have different compability in platforms
-            if (hostPlatform == UnityEngine.OperatingSystemFamily.Windows)
-                foreach (var winTarget in WindowsBuildTargets)
-                    if (winTarget == platform.Guid)
-                        return true;
-
-            else if(hostPlatform == UnityEngine.OperatingSystemFamily.MacOSX)
-                foreach (var macTarget in MacBuildTargets)
-                    if (macTarget == platform.Guid)
-                        return true;
 
-            else if (hostPlatform == UnityEngine.OperatingSystemFamily.Linux)
-                foreach (var linuxTarget in LinuxBuildTargets)
-                    if (linuxTarget == platform.Guid)
-                        return true;
+        static bool IsWindowsArm64Architecture()
+        {
+            // Based on WindowsUtility.GetHostOSArchitecture() in platform dependent code
+            // We can't use RuntimeInformation.OSArchitecture because it doesn't work on emulations
+            var architecture = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE", EnvironmentVariableTarget.Machine);
+            if (string.IsNullOrEmpty(architecture))
+                return false;
 
-            return false;
+            architecture = architecture.ToLowerInvariant();
+            return architecture.Contains("arm64") || architecture.Contains("aarch64");
         }
-        [System.Obsolete("BuildPlatformCanBeInstalledWithHub(BuildTarget) is obsolete. Use BuildPlatformCanBeInstalledWithHub(IBuildTarget) instead.", false)]
 
+        [System.Obsolete("BuildPlatformCanBeInstalledWithHub(BuildTarget) is obsolete. Use BuildPlatformCanBeInstalledWithHub(IBuildTarget) instead.", false)]
         public static bool BuildPlatformCanBeInstalledWithHub(BuildTarget platform)
         {
             foreach (var target in ExternalDownloadForBuildTarget)

Editor/Mono/CustomEditorAttributes.cs

@@ -320,7 +320,7 @@ static int SortUnityTypesFirst(MonoEditorType typeA, MonoEditorType typeB)
                     var yAssemblyIsUnity = InternalEditorUtility.IsUnityAssembly(typeB.inspectorType);
 
                     if (xAssemblyIsUnity == yAssemblyIsUnity)
-                        return 0;
+                        return string.CompareOrdinal(typeA.inspectorType.FullName, typeB.inspectorType.FullName);
                     if (xAssemblyIsUnity)
                         return 1;
                     return -1;