Unity 2021.2.0a8 C# reference source code

Author: Unity Technologies

Editor/Mono/AssetPipeline/LocalCacheServer.cs

@@ -177,9 +177,9 @@ public static void CreateIfNeeded()
 
         public static void Setup()
         {
-            var mode = (CacheServerPreferences.CacheServerMode)EditorPrefs.GetInt("CacheServerMode");
+            var mode = (AssetPipelinePreferences.CacheServerMode)EditorPrefs.GetInt("CacheServerMode");
 
-            if (mode == CacheServerPreferences.CacheServerMode.Local)
+            if (mode == AssetPipelinePreferences.CacheServerMode.Local)
                 CreateIfNeeded();
             else
                 Kill();

Editor/Mono/AssetPipeline/ShaderIncludeImporter.bindings.cs

@@ -0,0 +1,19 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine;
+using UnityEngine.Bindings;
+
+namespace UnityEditor
+{
+    [NativeHeader("Editor/Src/AssetPipeline/ShaderIncludeImporter.h")]
+    internal sealed partial class ShaderIncludeImporter : AssetImporter
+    {
+    }
+
+    [NativeHeader("Editor/Src/Shaders/ShaderInclude.h")]
+    internal sealed partial class ShaderInclude : Object
+    {
+    }
+}

Editor/Mono/AssetPipeline/TextureImporter.bindings.cs

@@ -371,6 +371,16 @@ internal void GetWidthAndHeight(ref int width, ref int height)
             height = info.height;
         }
 
+        public void GetSourceTextureWidthAndHeight(out int width, out int height)
+        {
+            var info = GetSourceTextureInformation();
+            if (info.width == -1)
+                throw new InvalidOperationException("The texture has not yet finished importing. This most likely means this method was called in an AssetPostprocessor.OnPreprocessAsset callback.");
+
+            width = info.width;
+            height = info.height;
+        }
+
         internal bool IsSourceTextureHDR()
         {
             return GetSourceTextureInformation().hdr;

Editor/Mono/BuildPipeline.bindings.cs

@@ -52,7 +52,7 @@ public enum BuildOptions
         AllowDebugging = 1 << 9,
 
         // Symlink runtime libraries when generating iOS XCode project. (Faster iteration time).
-        [Obsolete("BuildOptions.SymlinkLibraries is obsolete. Use BuildOptions.SymlinkSources instead (UnityUpgradable) -> [UnityEditor] BuildOptions.SymlinkSources", true)]
+        [Obsolete("BuildOptions.SymlinkLibraries is obsolete. Use BuildOptions.SymlinkSources instead (UnityUpgradable) -> [UnityEditor] BuildOptions.SymlinkSources", false)]
 
         SymlinkLibraries = 1 << 10,
 

Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs

@@ -532,7 +532,7 @@ protected static bool GetDevelopment(BuildPostProcessArgs args)
         return ((args.options & BuildOptions.Development) != 0);
     }
 
-    protected static bool IsHeadlessMode(BuildPostProcessArgs args)
+    protected static bool IsServerBuild(BuildPostProcessArgs args)
     {
         return ((args.options & BuildOptions.EnableHeadlessMode) != 0);
     }

Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs

@@ -9,7 +9,6 @@
 using System.Linq;
 using System.Text;
 using System.Runtime.InteropServices;
-using Unity.IL2CPP.BeeSettings;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Player;
@@ -459,6 +458,9 @@ internal static string[] GetBuildingIL2CPPArguments(IIl2CppPlatformProvider il2c
 
             arguments.Add("--avoid-dynamic-library-copy");
 
+            //make il2cpp not deploy baselib, as we already copy it in ourselves
+            arguments.Add("--dont-deploy-baselib");
+
             arguments.Add("--profiler-report");
 
             return arguments.ToArray();
@@ -479,11 +481,6 @@ internal static string GetIl2CppFolder()
                 "il2cpp"));
         }
 
-        internal static string GetIl2CppBeeSettingsFolder()
-        {
-            return $"{GetIl2CppFolder()}/build/BeeSettings/offline";
-        }
-
         internal static string GetTundraFolder()
         {
             return $"{GetIl2CppFolder()}/external/bee/tundra";
@@ -577,11 +574,7 @@ public void Run()
             var managedDir = Path.GetFullPath(Path.Combine(m_StagingAreaData, "Managed"));
 
             // Make all assemblies in Staging/Managed writable for stripping.
-            foreach (var file in Directory.GetFiles(managedDir))
-            {
-                var fileInfo = new FileInfo(file);
-                fileInfo.IsReadOnly = false;
-            }
+            ClearReadOnlyFlagOnAllFilesNonRecursively(managedDir);
 
             var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(m_PlatformProvider.target);
 
@@ -595,12 +588,17 @@ public void Run()
 
             Directory.CreateDirectory(m_TempFolder);
             Directory.CreateDirectory(generatedCppDir);
+            ClearReadOnlyFlagOnAllFilesNonRecursively(generatedCppDir);
 
             // Need to clean out the AdditionalCppFiles directory because a platform could do pretty much anything
             // in a "modifyOutputBeforeCompile" callback method, and so we need to provide a fresh directory. Bee will
             // still check the hash of these files before doing a build, so writing them again won't cause a recompile.
             if (Directory.Exists(additionalCppFilesDirectory))
+            {
+                ClearReadOnlyFlagOnAllFilesNonRecursively(additionalCppFilesDirectory);
                 Directory.Delete(additionalCppFilesDirectory, true);
+            }
+
             Directory.CreateDirectory(additionalCppFilesDirectory);
 
             if (m_ModifyOutputBeforeCompile != null)
@@ -611,6 +609,15 @@ public void Run()
             ConvertPlayerDlltoCpp(pipelineData);
         }
 
+        private static void ClearReadOnlyFlagOnAllFilesNonRecursively(string managedDir)
+        {
+            foreach (var file in Directory.GetFiles(managedDir))
+            {
+                var fileInfo = new FileInfo(file);
+                fileInfo.IsReadOnly = false;
+            }
+        }
+
         public void RunCompileAndLink(string il2cppBuildCacheSource)
         {
             if (string.Equals(Path.GetFullPath(il2cppBuildCacheSource), Path.GetFullPath(m_PlatformProvider.il2cppBuildCacheDirectory), StringComparison.OrdinalIgnoreCase))
@@ -709,6 +716,10 @@ private void ConvertPlayerDlltoCpp(Il2CppBuildPipelineData data)
                 Il2CppNativeCodeBuilderUtils.ClearAndPrepareCacheDirectory(il2CppNativeCodeBuilder);
                 arguments.AddRange(Il2CppNativeCodeBuilderUtils.AddBuilderArguments(il2CppNativeCodeBuilder, buildCacheNativeOutputFile, m_PlatformProvider.includePaths, m_PlatformProvider.libraryPaths, compilerConfiguration));
             }
+            else
+            {
+                arguments.Add($"--cachedirectory={CommandLineFormatter.PrepareFileName(GetShortPathName(Path.GetFullPath(m_PlatformProvider.il2cppBuildCacheDirectory)))}");
+            }
 
             // Additional files can take any form, depending on platform, so pass anything in the additional files directory
             foreach (var additionalCppFile in Directory.GetFiles(GetAdditionalCppFilesDirectory(m_PlatformProvider.il2cppBuildCacheDirectory)))
@@ -727,7 +738,6 @@ private void ConvertPlayerDlltoCpp(Il2CppBuildPipelineData data)
                 arguments.Add(additionalArgs);
 
             arguments.Add($"--directory={CommandLineFormatter.PrepareFileName(GetShortPathName(Path.GetFullPath(data.inputDirectory)))}");
-
             arguments.Add($"--generatedcppdir={CommandLineFormatter.PrepareFileName(GetCppOutputDirectory(m_PlatformProvider.il2cppBuildCacheDirectory))}");
 
             // NOTE: any arguments added here that affect how generated code is built need
@@ -771,29 +781,13 @@ private void RunIl2CppWithArguments(List<string> arguments, Action<ProcessStartI
             var nativeOutputDirectoryInBuildCache = GetNativeOutputRelativeDirectory(m_PlatformProvider.il2cppBuildCacheDirectory);
             var nativeOutputDirectoryInStagingArea = GetNativeOutputRelativeDirectory(m_StagingAreaData);
 
-            BeeSettingsIl2Cpp beeSettings = new BeeSettingsIl2Cpp();
             var il2cppOutputParser = new Il2CppOutputParser(Path.Combine(cppOutputDirectoryInBuildCache, "Il2CppToEditorData.json"));
 
-            beeSettings.ToolPath = $"{EscapeSpacesInPath(GetIl2CppExe())}";
-            beeSettings.Arguments.AddRange(arguments);
-            beeSettings.Serialize(m_PlatformProvider.il2cppBuildCacheDirectory);
-
-            void SetupTundraAndStartInfo(ProcessStartInfo startInfo)
-            {
-                if (setupStartInfo != null)
-                    setupStartInfo(startInfo);
-
-                // For some reason, TUNDRA_EXECUTABLE needs to be unescaped in order to be found on OSX,
-                // but MONO_EXECUTABLE needs to be escaped in order to be found on OSX
-                startInfo.EnvironmentVariables.Add("TUNDRA_EXECUTABLE", GetIl2CppTundraExe());
-                startInfo.EnvironmentVariables.Add("REAPI_CACHE_CLIENT", GetIl2CppReapiCacheClientExe());
-                startInfo.EnvironmentVariables.Add("MONO_EXECUTABLE", EscapeSpacesInPath(GetMonoBleedingEdgeExe()));
-            }
+            arguments.Add("--convert-in-graph");
 
             var args = arguments.Aggregate(String.Empty, (current, arg) => current + arg + " ");
-            var beeArgs = $"--no-colors --prebuiltbuildprogram={EscapeSpacesInPath(GetIl2CppBeeBuildProgramExe())}";
-            Console.WriteLine("Invoking il2cpp (via bee.exe) with arguments: " + args);
-            Runner.RunManagedProgram(GetIl2CppBeeExe(), beeArgs, m_PlatformProvider.il2cppBuildCacheDirectory, il2cppOutputParser, SetupTundraAndStartInfo);
+            Console.WriteLine("Invoking il2cpp with arguments: " + args);
+            Runner.RunNetCoreProgram(GetIl2CppExe(), args, m_PlatformProvider.il2cppBuildCacheDirectory, il2cppOutputParser, setupStartInfo);
 
             // Copy IL2CPP outputs to StagingArea
             if (Directory.Exists(nativeOutputDirectoryInBuildCache))
@@ -820,21 +814,6 @@ private string GetIl2CppExe()
             return $"{IL2CPPUtils.GetIl2CppFolder()}/build/deploy/netcoreapp3.1/il2cpp{(Application.platform == RuntimePlatform.WindowsEditor ? ".exe" : "")}";
         }
 
-        private string GetIl2CppBeeExe()
-        {
-            return $"{IL2CPPUtils.GetIl2CppBeeSettingsFolder()}/bee.exe";
-        }
-
-        private string GetIl2CppBeeArtifactsDirectory()
-        {
-            return $"{IL2CPPUtils.GetIl2CppBeeSettingsFolder()}/artifacts";
-        }
-
-        private string GetIl2CppBeeBuildProgramExe()
-        {
-            return $"{GetIl2CppBeeArtifactsDirectory()}/buildprogram/buildprogram.exe";
-        }
-
         private string GetIl2CppTundraExe()
         {
             if (Application.platform == RuntimePlatform.OSXEditor)

Editor/Mono/BuildPipeline/Il2Cpp/Il2CppNativeCodeBuilderUtils.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using NiceIO;
 using UnityEditor;
 
 namespace UnityEditorInternal
@@ -31,14 +32,25 @@ public static IEnumerable<string> AddBuilderArguments(Il2CppNativeCodeBuilder bu
 
             arguments.Add(FormatArgument("outputpath", builder.ConvertOutputFileToFullPath(outputRelativePath)));
 
+            string cacheDirectory = null;
             if (!string.IsNullOrEmpty(builder.CacheDirectory) && !builder.OverriddenCacheDirectory)
-                arguments.Add(FormatArgument("cachedirectory", IL2CPPBuilder.GetShortPathName(CacheDirectoryPathFor(builder.CacheDirectory))));
+            {
+                cacheDirectory = IL2CPPBuilder.GetShortPathName(CacheDirectoryPathFor(builder.CacheDirectory));
+                arguments.Add(FormatArgument("cachedirectory", cacheDirectory));
+            }
 
             if (!string.IsNullOrEmpty(builder.CompilerFlags))
                 arguments.Add(FormatArgument("compiler-flags", builder.CompilerFlags));
 
             if (!string.IsNullOrEmpty(builder.LinkerFlags))
-                arguments.Add(FormatArgument("linker-flags", builder.LinkerFlags));
+            {
+                if (cacheDirectory == null)
+                    throw new ArgumentException("If you pass linkerflags, a cachedirectory also needs to be passed.");
+
+                NPath templinkerflagsTxt = $"{cacheDirectory}/linkerflags/linkerflags.txt";
+                templinkerflagsTxt.WriteAllText(builder.LinkerFlags);
+                arguments.Add(FormatArgument("linker-flags-file", templinkerflagsTxt.ToString()));
+            }
 
             if (!string.IsNullOrEmpty(builder.PluginPath))
                 arguments.Add(FormatArgument("plugin", builder.PluginPath));

Editor/Mono/CutBoard.cs

@@ -136,7 +136,7 @@ private static void PasteToScene(Scene targetScene)
 
         private static void SetParent(Transform go, Transform parent)
         {
-            Undo.SetTransformParent(go, parent, kCutAndPaste);
+            Undo.SetTransformParent(go, parent, false, kCutAndPaste);
             go.SetAsLastSibling();
         }
 

Editor/Mono/EditorGUI.cs

@@ -3448,9 +3448,9 @@ public static int GetSelectedValueForControl(int controlID, int selected)
                     }
                     if (instance.m_ControlID == controlID)
                     {
+                        GUI.changed = selected != instance.m_SelectedIndex;
                         selected = instance.m_SelectedIndex;
                         instance = null;
-                        GUI.changed = true;
                         evt.Use();
                     }
                 }

Editor/Mono/EditorGUIUtility.bindings.cs

@@ -154,7 +154,7 @@ public static void RenderGameViewCameras(RenderTexture target, int targetDisplay
 
         private static extern Texture2D FindTextureByName(string name);
         private static extern Texture2D FindTextureByType([NotNull] Type type);
-        private static extern string GetObjectNameWithInfo(Object obj);
+        internal static extern string GetObjectNameWithInfo(Object obj);
         private static extern string GetTypeNameWithInfo(string typeName, int instanceID);
         private static extern void Internal_SetupEventValues(object evt);
         private static extern Vector2 Internal_GetIconSize();