Unity 2020.2.0a21 C# reference source code

Author: Unity Technologies

Editor/Mono/AssemblyHelper.cs

@@ -7,18 +7,22 @@
 using System.Linq;
 using System.Reflection;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Mono.Cecil;
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using UnityEngine;
 using System.Runtime.InteropServices;
+using UnityEditor.VisualStudioIntegration;
 using UnityEngine.Scripting;
+using Debug = UnityEngine.Debug;
 
 namespace UnityEditor
 {
     internal partial class AssemblyHelper
     {
         static Dictionary<string, bool> managedToDllType = new Dictionary<string, bool>();
+        static BuildPlayerDataExtractor m_BuildPlayerDataExtractor = new BuildPlayerDataExtractor();
 
         // Check if assmebly internal name doesn't match file name, and show the warning.
         static public void CheckForAssemblyFileNameMismatch(string assemblyPath)
@@ -327,24 +331,17 @@ public static void ExtractAllClassesThatAreUserExtendedScripts(string path, out
             originalClassNameSpacesArray = originalNamespaces.ToArray();
         }
 
-        struct GetAssemblyResolverData
+        /// Extract information about all types in the specified assembly, searchDirs might be used to resolve dependencies.
+        [RequiredByNativeCode]
+        static public AssemblyInfoManaged[] ExtractAssemblyTypeInfo(bool isEditor)
         {
-            public IAssemblyResolver Resolver;
-            public string[] SearchDirs;
+            var extractAssemblyTypeInfo = m_BuildPlayerDataExtractor.ExtractAssemblyTypeInfo(isEditor);
+            return extractAssemblyTypeInfo;
         }
 
-        /// Extract information about all types in the specified assembly, searchDirs might be used to resolve dependencies.
-        static public AssemblyTypeInfoGenerator.ClassInfo[] ExtractAssemblyTypeInfo(BuildTarget targetPlatform, bool isEditor, string assemblyPathName, string[] searchDirs)
+        static public AssemblyInfoManaged[] ExtractAssemblyTypeInfoFromFiles(string[] typeDbJsonPaths)
         {
-            try
-            {
-                AssemblyTypeInfoGenerator gen = new AssemblyTypeInfoGenerator(assemblyPathName, searchDirs);
-                return gen.GatherClassInfo();
-            }
-            catch (System.Exception ex)
-            {
-                throw new Exception("ExtractAssemblyTypeInfo: Failed to process " + assemblyPathName + ", " + ex);
-            }
+            return m_BuildPlayerDataExtractor.ExtractAssemblyTypeInfoFromFiles(typeDbJsonPaths);
         }
 
         [StructLayout(LayoutKind.Sequential)]
@@ -354,88 +351,17 @@ public struct RuntimeInitializeOnLoadMethodsData
             public int methodsCount;
         }
 
-        static void FindRuntimeInitializeOnLoadMethodAttributes(TypeDefinition type,
-            string assemblyName,
-            ref List<RuntimeInitializeClassInfo> classInfoList,
-            ref int methodCount)
+        [RequiredByNativeCode]
+        public static void ExtractPlayerRuntimeInitializeOnLoadMethods(string jsonPath)
         {
-            if (!type.HasMethods)
-                return;
-
-            foreach (var method in type.Methods)
+            try
             {
-                // RuntimeInitializeOnLoadMethod only works on static methods.
-                if (!method.IsStatic)
-                    continue;
-
-                foreach (var attribute in method.CustomAttributes)
-                {
-                    if (attribute.AttributeType.FullName == "UnityEngine.RuntimeInitializeOnLoadMethodAttribute")
-                    {
-                        RuntimeInitializeLoadType loadType = RuntimeInitializeLoadType.AfterSceneLoad;
-
-                        if (attribute.ConstructorArguments != null && attribute.ConstructorArguments.Count > 0)
-                            loadType = (RuntimeInitializeLoadType)attribute.ConstructorArguments[0].Value;
-
-                        RuntimeInitializeClassInfo classInfo = new RuntimeInitializeClassInfo();
-
-                        classInfo.assemblyName = assemblyName;
-                        classInfo.className = type.FullName;
-                        classInfo.methodNames = new[] { method.Name };
-                        classInfo.loadTypes = new[] { loadType };
-                        classInfoList.Add(classInfo);
-                        methodCount++;
-                    }
-                }
+                m_BuildPlayerDataExtractor.ExtractPlayerRuntimeInitializeOnLoadMethods(jsonPath);
             }
-        }
-
-        [RequiredByNativeCode]
-        public static RuntimeInitializeOnLoadMethodsData ExtractPlayerRuntimeInitializeOnLoadMethods(BuildTarget targetPlatform, string[] assemblyPaths, string[] searchDirs)
-        {
-            var classInfoList = new List<RuntimeInitializeClassInfo>();
-            int methodCount = 0;
-
-            foreach (var assemblyPath in assemblyPaths)
+            catch (Exception exception)
             {
-                try
-                {
-                    var assemblyResolverData = new GetAssemblyResolverData { SearchDirs = searchDirs, };
-                    var resolver = new DefaultAssemblyResolver();
-                    foreach (var searchDir in searchDirs)
-                        resolver.AddSearchDirectory(searchDir);
-
-                    assemblyResolverData.Resolver = resolver;
-
-                    var assembly = AssemblyDefinition.ReadAssembly(assemblyPath, new ReaderParameters
-                    {
-                        AssemblyResolver = assemblyResolverData.Resolver
-                    });
-
-                    var assemblyName = assembly.Name.Name;
-
-                    foreach (var module in assembly.Modules)
-                    {
-                        foreach (var type in module.Types)
-                        {
-                            FindRuntimeInitializeOnLoadMethodAttributes(type,
-                                assemblyName,
-                                ref classInfoList,
-                                ref methodCount);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    throw new Exception("ExtractPlayerRuntimeInitializeOnLoadMethods: Failed to process " + assemblyPath + ", " + ex);
-                }
+                Debug.LogError($"Failed extracting RuntimeInitializeOnLoadMethods. Player will not be able to execute RuntimeInitializeOnLoadMethods: {exception.Message}{Environment.NewLine}{exception.StackTrace}");
             }
-
-            var data = new RuntimeInitializeOnLoadMethodsData();
-            data.classInfos = classInfoList.ToArray();
-            data.methodsCount = methodCount;
-
-            return data;
         }
 
         internal static Type[] GetTypesFromAssembly(Assembly assembly)

Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs

@@ -32,7 +32,7 @@ public static string[] FindAssets(string filter, string[] searchInFolders)
 
         internal static string[] FindAssets(SearchFilter searchFilter)
         {
-            return FindAllAssets(searchFilter).Select(property => property.guid).ToArray();
+            return FindAllAssets(searchFilter).Select(property => property.guid).Distinct().ToArray();
         }
 
         internal static IEnumerable<HierarchyProperty> FindAllAssets(SearchFilter searchFilter)

Editor/Mono/BuildPipeline.bindings.cs

@@ -412,6 +412,15 @@ private static BuildReport BuildPlayerInternal(string[] levels, string locationP
         // Just like BuildPlayer, but does not check for Pro license. Used from build player dialog.
         internal static extern BuildReport BuildPlayerInternalNoCheck(string[] levels, string locationPathName, string assetBundleManifestPath, BuildTargetGroup buildTargetGroup, BuildTarget target, BuildOptions options, string[] extraScriptingDefines, bool delayToAfterScriptReload);
 
+
+        [FreeFunction("WriteBootConfig", ThrowsException = true)]
+        static extern void WriteBootConfig(string outputFile, BuildTargetGroup buildTargetGroup, BuildTarget target, BuildOptions options);
+
+        public static void WriteBootConfig(string outputFile, BuildTarget target, BuildOptions options)
+        {
+            WriteBootConfig(outputFile, BuildPipeline.GetBuildTargetGroup(target), target, options);
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         private struct BuildPlayerDataResult
         {

Editor/Mono/BuildPipeline/AssemblyTypeInfoGenerator.cs

@@ -11,10 +11,54 @@
 using System.Runtime.InteropServices;
 using Mono.Cecil;
 using Unity.SerializationLogic;
+using UnityEngine;
+using UnityEngine.Bindings;
 
 namespace UnityEditor
 {
     using GenericInstanceTypeMap = System.Collections.Generic.Dictionary<TypeReference, TypeReference>;
+    [NativeHeader("Modules/BuildPipeline/Editor/Public/TypeDB.h")]
+    [Serializable]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct FieldInfoManaged
+    {
+        public string name;
+        public string type;
+        public int flags;
+        public int fixedBufferLength;
+        public string fixedBufferTypename;
+    }
+
+    [NativeHeader("Modules/BuildPipeline/Editor/Public/TypeDB.h")]
+    [Serializable]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct TypeInformationManaged
+    {
+        public string className;
+        public FieldInfoManaged[] fieldInfos;
+    }
+
+    [NativeHeader("Modules/BuildPipeline/Editor/Public/TypeDB.h")]
+    [Serializable]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct AssemblyInfoManaged
+    {
+        public string name;
+        public string path;
+        public TypeInformationManaged[] types;
+    }
+
+    [Serializable]
+    internal class ExtractRoot<T>
+    {
+        public T[] root;
+    }
+
+    [Serializable]
+    internal struct ExtractRootRuntime
+    {
+        public RuntimeInitializeClassInfo[] root;
+    }
 
     internal class AssemblyTypeInfoGenerator
     {

Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs

@@ -556,12 +556,18 @@ public void Run()
 
         public void RunCompileAndLink(string il2cppBuildCacheSource)
         {
+            if (string.Equals(Path.GetFullPath(il2cppBuildCacheSource), Path.GetFullPath(m_PlatformProvider.il2cppBuildCacheDirectory), StringComparison.OrdinalIgnoreCase))
+                throw new ArgumentException("IIl2CppPlatformProvider.il2cppBuildCacheDirectory cannot be the same as il2cppBuildCacheDirectory. You probably forgot to override il2cppBuildCacheDirectory on your IIl2CppPlatformProvider.");
+
             var il2CppNativeCodeBuilder = m_PlatformProvider.CreateIl2CppNativeCodeBuilder();
             if (il2CppNativeCodeBuilder != null)
             {
                 Il2CppNativeCodeBuilderUtils.ClearAndPrepareCacheDirectory(il2CppNativeCodeBuilder);
 
-                var buildCacheNativeOutputFile = Path.Combine(GetNativeOutputDirectory(m_PlatformProvider.il2cppBuildCacheDirectory), m_PlatformProvider.nativeLibraryFileName);
+                var buildCacheDirectory = m_PlatformProvider.il2cppBuildCacheDirectory;
+                Directory.CreateDirectory(buildCacheDirectory);
+
+                var buildCacheNativeOutputFile = Path.Combine(GetNativeOutputDirectory(buildCacheDirectory), m_PlatformProvider.nativeLibraryFileName);
                 var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(m_PlatformProvider.target);
                 var compilerConfiguration = PlayerSettings.GetIl2CppCompilerConfiguration(buildTargetGroup);
                 var arguments = Il2CppNativeCodeBuilderUtils.AddBuilderArguments(il2CppNativeCodeBuilder, buildCacheNativeOutputFile, m_PlatformProvider.includePaths, m_PlatformProvider.libraryPaths, compilerConfiguration).ToList();
@@ -750,7 +756,10 @@ void SetupTundraAndStartInfo(ProcessStartInfo startInfo)
             // Copy IL2CPP outputs to StagingArea
             var nativeOutputDirectoryInBuildCache = GetNativeOutputDirectory(m_PlatformProvider.il2cppBuildCacheDirectory);
             if (Directory.Exists(nativeOutputDirectoryInBuildCache))
-                FileUtil.CopyDirectoryRecursive(nativeOutputDirectoryInBuildCache, GetNativeOutputDirectory(m_StagingAreaData));
+            {
+                var outputDirectory = GetNativeOutputDirectory(m_StagingAreaData);
+                FileUtil.CopyDirectoryRecursive(nativeOutputDirectoryInBuildCache, outputDirectory, true);
+            }
 
             // Copy Generated C++ files and Data directory to StagingArea.
             // This directory will only be present when using "--convert-to-cpp" with IL2CPP.

Editor/Mono/BuildPlayerDataExtractor.cs

@@ -0,0 +1,61 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor.Build.Player;
+using UnityEditor.VisualStudioIntegration;
+using UnityEngine;
+
+namespace UnityEditor
+{
+    internal class BuildPlayerDataExtractor
+    {
+        private readonly IDirectoryIO m_DirectoryIO;
+        private readonly IFileIO m_FileIO;
+
+        public BuildPlayerDataExtractor(IDirectoryIO mDirectoryIo, IFileIO mFileIo)
+        {
+            m_DirectoryIO = mDirectoryIo;
+            m_FileIO = mFileIo;
+        }
+
+        public BuildPlayerDataExtractor()
+        {
+            m_DirectoryIO = new DirectoryIOProvider();
+            m_FileIO = new FileIOProvider();
+        }
+
+        public AssemblyInfoManaged[] ExtractAssemblyTypeInfo(bool isEditor)
+        {
+            var buildPlayerDataGeneratorHelper = new BuildPlayerDataGenerator(new BuildPlayerDataGeneratorProcess(), new DirectoryIOProvider());
+            return ExtractAssemblyTypeInfoFromFiles(buildPlayerDataGeneratorHelper.GetTypeDbFilePaths(isEditor));
+        }
+
+        public  AssemblyInfoManaged[] ExtractAssemblyTypeInfoFromFiles(string[] typeDbJsonPaths)
+        {
+            List<AssemblyInfoManaged> assemblyInfoResults = new List<AssemblyInfoManaged>(typeDbJsonPaths.Length);
+            foreach (var typeDbFile in typeDbJsonPaths)
+            {
+                var assemblyInfos = JsonUtility.FromJson<ExtractRoot<AssemblyInfoManaged>>(File.ReadAllText(typeDbFile));
+                assemblyInfoResults.AddRange(assemblyInfos.root);
+            }
+            return assemblyInfoResults.ToArray();
+        }
+
+        public void ExtractPlayerRuntimeInitializeOnLoadMethods(string jsonPath)
+        {
+            m_DirectoryIO.CreateDirectory(jsonPath);
+
+            var path = Path.Combine(BuildPlayerDataGenerator.OutputPath, "Player");
+            var sourceRuntimeInitializeOnLoads = Path.Combine(path, "RuntimeInitializeOnLoads.json");
+            if (!m_DirectoryIO.Exists(path) || !m_FileIO.Exists(sourceRuntimeInitializeOnLoads))
+            {
+                return;
+            }
+
+            m_FileIO.Copy(sourceRuntimeInitializeOnLoads, Path.Combine(jsonPath, "RuntimeInitializeOnLoads.json"), true);
+        }
+    }
+}

Editor/Mono/BuildPlayerWindow.cs

@@ -66,7 +66,7 @@ public GUIContent GetDownloadErrorForTarget(BuildTarget target)
             public GUIContent autoconnectProfilerDisabled = EditorGUIUtility.TrTextContent("Autoconnect Profiler", "Profiling is only enabled in a Development Player.");
             public GUIContent buildWithDeepProfiler = EditorGUIUtility.TrTextContent("Deep Profiling Support", "Build Player with Deep Profiling Support. This might affect Player performance.");
             public GUIContent buildWithDeepProfilerDisabled = EditorGUIUtility.TrTextContent("Deep Profiling", "Profiling is only enabled in a Development Player.");
-            public GUIContent allowDebugging = EditorGUIUtility.TrTextContent("Script Debugging");
+            public GUIContent allowDebugging = EditorGUIUtility.TrTextContent("Script Debugging", "Enable this setting to allow your script code to be debugged.");
             public GUIContent waitForManagedDebugger = EditorGUIUtility.TrTextContent("Wait For Managed Debugger", "Show a dialog where you can attach a managed debugger before any script execution.");
             public GUIContent explicitNullChecks = EditorGUIUtility.TrTextContent("Explicit Null Checks");
             public GUIContent explicitDivideByZeroChecks = EditorGUIUtility.TrTextContent("Divide By Zero Checks");
@@ -91,7 +91,7 @@ public GUIContent GetDownloadErrorForTarget(BuildTarget target)
 
 
         Vector2 scrollPosition = new Vector2(0, 0);
-
+        Vector2 buildTargetSettingsScrollPosition = new Vector2(0, 0);
         private const string kEditorBuildSettingsPath = "ProjectSettings/EditorBuildSettings.asset";
 
         static Styles styles = null;
@@ -155,7 +155,7 @@ void ActiveScenesGUI()
             Rect scenesInBuildRect = GUILayoutUtility.GetRect(styles.scenesInBuild, styles.title);
             GUI.Label(scenesInBuildRect, styles.scenesInBuild, styles.title);
 
-            Rect rect = GUILayoutUtility.GetRect(0, position.width, 0, position.height);
+            Rect rect = GUILayoutUtility.GetRect(0, position.width, 0, position.height, GUILayout.MinHeight(20));
             m_TreeView.OnGUI(rect);
         }
 
@@ -363,7 +363,7 @@ void OnGUI()
 
             GUILayout.Space(10);
 
-            GUILayout.BeginHorizontal(GUILayout.Height(351));
+            GUILayout.BeginHorizontal(GUILayout.Height(400));
             ActiveBuildTargetsGUI();
             GUILayout.Space(10);
             GUILayout.BeginVertical();
@@ -486,7 +486,7 @@ static bool IsVirtualTexturingSettingsValid(BuildPlatform platform)
         };
         static public string GetPlaybackEngineDownloadURL(string moduleName)
         {
-            if (moduleName == "PS4" || moduleName == "XboxOne")
+            if (moduleName == "PS4" || moduleName == "XboxOne" || moduleName == "GameCoreXboxOne" || moduleName == "GameCoreScarlett")
                 return "https://unity3d.com/platform-installation";
 
             string fullVersion = InternalEditorUtility.GetFullUnityVersion();
@@ -709,6 +709,8 @@ void ShowBuildTargetSettings()
                 return;
             }
 
+            buildTargetSettingsScrollPosition = GUILayout.BeginScrollView(buildTargetSettingsScrollPosition);
+
             // FIXME: WHY IS THIS ALL IN ONE FUNCTION?!
             // Draw the side bar to the right. Different options like specific Standalone player to build, profiling and debugging options, etc.
             string module = ModuleManager.GetTargetStringFrom(platform.targetGroup, buildTarget);
@@ -861,6 +863,8 @@ void ShowBuildTargetSettings()
                 GUILayout.EndHorizontal();
             }
 
+            GUILayout.EndScrollView();
+
             GUIBuildButtons(buildWindowExtension, enableBuildButton, enableBuildAndRunButton,
                 canInstallInBuildFolder, platform);
         }