Unity 2021.2.0a19 C# reference source code

Author: Unity Technologies

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -35,6 +35,7 @@ public class PlayerBuildConfig
         public bool GenerateIdeProject;
         public bool Development;
         public Services Services;
+        public StreamingAssetsFile[] StreamingAssetsFiles;
     }
 
     public class BuiltFilesOutput
@@ -81,4 +82,10 @@ public class Services
         public bool EnableAnalytics;
         public bool EnableCrashReporting;
     }
+
+    public class StreamingAssetsFile
+    {
+        public string File;
+        public string RelativePath;
+    }
 }

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

@@ -64,7 +64,7 @@ class Styles
             public readonly GUIContent copyMasterButton = EditorGUIUtility.TrTextContent("Copy Master's Settings", "Copy all master's settings into this variant.");
 
             public readonly GUIContent disabledPackLabel = EditorGUIUtility.TrTextContent("Sprite Atlas packing is disabled. Enable it in Edit > Project Settings > Editor.", null, EditorGUIUtility.GetHelpIcon(MessageType.Info));
-            public readonly GUIContent packableListLabel = EditorGUIUtility.TrTextContent("Objects for Packing", "Only accepts Sprite Sheet (Texture) and Sprite.");
+            public readonly GUIContent packableListLabel = EditorGUIUtility.TrTextContent("Objects for Packing", "Only accepts Folders, Sprite Sheet (Texture) and Sprite.");
 
             public readonly GUIContent notPowerOfTwoWarning = EditorGUIUtility.TrTextContent("This scale will produce a Variant Sprite Atlas with a packed Texture that is NPOT (non - power of two). This may cause visual artifacts in certain compression/Texture formats.");
             public readonly GUIContent secondaryTextureNameLabel = EditorGUIUtility.TrTextContent("Secondary Texture Name", "The name of the Secondary Texture to apply the following settings to.");
@@ -167,7 +167,7 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
 
         static bool IsPackable(Object o)
         {
-            return o != null && (o.GetType() == typeof(Sprite) || o.GetType() == typeof(Texture2D));
+            return o != null && (o.GetType() == typeof(Sprite) || o.GetType() == typeof(Texture2D) || (o.GetType() == typeof(DefaultAsset) && ProjectWindowUtil.IsFolder(o.GetInstanceID())));
         }
 
         static Object ValidateObjectForPackableFieldAssignment(Object[] references, System.Type objType, SerializedProperty property, EditorGUI.ObjectFieldValidatorOptions options)
@@ -337,7 +337,7 @@ void RenameSecondaryPlatformSettings(string oldName, string newName)
         void AddPackable(ReorderableList list)
         {
             ObjectSelector.get.Show(null, typeof(Object), null, false);
-            ObjectSelector.get.searchFilter = "t:sprite t:texture2d";
+            ObjectSelector.get.searchFilter = "t:sprite t:texture2d t:folder";
             ObjectSelector.get.objectSelectorID = styles.packableSelectorHash;
         }
 

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -73,6 +73,7 @@ private enum EnabledState
         Vector2 m_ScrollPosition;
         bool m_SyncWithState;
         string m_LastScriptThatHasShownTheIconSelector;
+
         List<MonoScript> m_MonoScriptIconsChanged;
 
         const int maxShowRecent = 5;
@@ -144,7 +145,7 @@ void OnDisable()
             AssemblyReloadEvents.beforeAssemblyReload -= Close;
             // When window closes we copy all changes to monoimporters (reimport monoScripts)
             foreach (MonoScript monoScript in m_MonoScriptIconsChanged)
-                MonoImporter.CopyMonoScriptIconToImporters(monoScript);
+                IconSelector.CopyIconToImporter(monoScript);
 
             s_LastClosedTime = System.DateTime.Now.Ticks / System.TimeSpan.TicksPerMillisecond;
             s_AnnotationWindow = null;

Editor/Mono/AssemblyHelper.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Mono.Cecil;
+using UnityEditor.Build;
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using UnityEngine;
@@ -25,6 +26,7 @@ internal partial class AssemblyHelper
         static BuildPlayerDataExtractor m_BuildPlayerDataExtractor = new BuildPlayerDataExtractor();
 
         // Check if assmebly internal name doesn't match file name, and show the warning.
+        [RequiredByNativeCode]
         static public void CheckForAssemblyFileNameMismatch(string assemblyPath)
         {
             string fileName = Path.GetFileNameWithoutExtension(assemblyPath);
@@ -99,7 +101,7 @@ static private bool IgnoreAssembly(string assemblyPath, BuildTarget target)
             }
             else if (target == BuildTarget.XboxOne)
             {
-                var profile = PlayerSettings.GetApiCompatibilityLevel(BuildTargetGroup.XboxOne);
+                var profile = PlayerSettings.GetApiCompatibilityLevel(NamedBuildTarget.XboxOne);
                 if (profile == ApiCompatibilityLevel.NET_4_6 || profile == ApiCompatibilityLevel.NET_Standard_2_0)
                 {
                     if (CouldBelongToDotNetOrWindowsRuntime(assemblyPath))
@@ -192,6 +194,7 @@ static string FindAssemblyName(string fullName, string name, string[] allAssembl
             return "";
         }
 
+        [RequiredByNativeCode]
         static public string[] FindAssembliesReferencedBy(string[] paths, string[] foldersToSearch, BuildTarget target)
         {
             List<string> unique = new List<string>();
@@ -207,13 +210,6 @@ static public string[] FindAssembliesReferencedBy(string[] paths, string[] folde
             return unique.ToArray();
         }
 
-        static public string[] FindAssembliesReferencedBy(string path, string[] foldersToSearch, BuildTarget target)
-        {
-            string[] tmp = new string[1];
-            tmp[0] = path;
-            return FindAssembliesReferencedBy(tmp, foldersToSearch, target);
-        }
-
         static public bool IsUnityEngineModule(AssemblyDefinition assembly)
         {
             return assembly.CustomAttributes.Any(a => a.AttributeType.FullName == typeof(UnityEngineModuleAssembly).FullName);

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -45,6 +45,7 @@
 [assembly: InternalsVisibleTo("Unity.WebGL.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.LinuxStandalone.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.CloudRendering.Extensions")]
+[assembly: InternalsVisibleTo("UnityEditor.EmbeddedLinux.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.WindowsStandalone.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.OSXStandalone.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.Lumin.Extensions")]

Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using UnityEditor.Utils;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -66,11 +67,12 @@ private static IEnumerator<T> FindInFolders<T>(SearchFilter searchFilter, Func<H
 
             foreach (var folderPath in folders)
             {
-                var folderInstanceID = AssetDatabase.GetMainAssetOrInProgressProxyInstanceID(folderPath);
+                var sanitizedFolderPath = folderPath.ConvertSeparatorsToUnity().TrimTrailingSlashes();
+                var folderInstanceID = AssetDatabase.GetMainAssetOrInProgressProxyInstanceID(sanitizedFolderPath);
                 var rootPath = "Assets";
 
                 // Find the right rootPath if folderPath is part of a package
-                var packageInfo = PackageManager.PackageInfo.FindForAssetPath(folderPath);
+                var packageInfo = PackageManager.PackageInfo.FindForAssetPath(sanitizedFolderPath);
                 if (packageInfo != null)
                 {
                     rootPath = packageInfo.assetPath;
@@ -94,7 +96,7 @@ private static IEnumerator<T> FindInFolders<T>(SearchFilter searchFilter, Func<H
                 }
                 else
                 {
-                    Debug.LogWarning("AssetDatabase.FindAssets: Folder not found: '" + folderPath + "'");
+                    Debug.LogWarning("AssetDatabase.FindAssets: Folder not found: '" + sanitizedFolderPath + "'");
                 }
             }
         }

Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs

@@ -32,6 +32,9 @@ public class AssetImportContext
         AssetImportContext() {}
 
         public extern string assetPath { get; internal set; }
+
+        [Obsolete("GetResultPath has been deprecated. Use GetOutputArtifactFilePath(string) instead (UnityUpgradable) -> GetOutputArtifactFilePath(*)")]
+        [NativeName("GetOutputArtifactFilePath")]
         public extern string GetResultPath(string extension);
 
         public extern BuildTarget selectedBuildTarget { get; }
@@ -95,6 +98,23 @@ internal void DependsOnImportedAsset(string path)
             DependsOnImportedAssetInternal(path);
         }
 
+        [NativeName("GetArtifactFilePath")]
+        private extern string GetArtifactFilePath_Internal(string path, string fileName);
+
+        public string GetArtifactFilePath(string path, string fileName)
+        {
+            return GetArtifactFilePath_Internal(path, fileName);
+        }
+
+        public string GetArtifactFilePath(GUID guid, string fileName)
+        {
+            return GetArtifactFilePath(new ArtifactKey(guid), fileName);
+        }
+
+        public extern string GetArtifactFilePath(ArtifactKey key, string fileName);
+
+        public extern string GetOutputArtifactFilePath(string fileName);
+
         [NativeName("DependsOnImportedAsset")]
         private extern void DependsOnImportedAssetInternal(string path);
 

Editor/Mono/AssetPipeline/TextureGenerator.bindings.cs

@@ -52,6 +52,7 @@ public struct TextureGenerationOutput
         private Sprite[] m_Sprites;
 
         public Texture2D texture { get { return m_Texture as Texture2D; } }
+        public Texture output { get { return m_Texture; } }
         public string importInspectorWarnings { get { return m_ImportInspectorWarnings; } }
         public string[] importWarnings { get { return m_ImportWarnings; } }
         public Texture2D thumbNail { get { return m_ThumbNail; } }

Editor/Mono/AssetPipeline/TextureImporterTypes.bindings.cs

@@ -64,6 +64,8 @@ public sealed partial class TextureImporterSettings
         [SerializeField]
         int  m_StreamingMipmapsPriority;
 
+        [SerializeField]
+        int m_VTOnly;
         [SerializeField]
         int m_IgnoreMasterTextureLimit;
 
@@ -302,6 +304,11 @@ public int streamingMipmapsPriority
             set { m_StreamingMipmapsPriority = value; }
         }
 
+        public bool vtOnly
+        {
+            get { return m_VTOnly != 0; }
+            set { m_VTOnly = value ? 1 : 0; }
+        }
         internal bool ignoreMasterTextureLimit
         {
             get { return m_IgnoreMasterTextureLimit != 0; }

Editor/Mono/Audio/Mixer/Bindings/AudioMixerController.cs

@@ -443,6 +443,7 @@ public void RemoveEffect(AudioMixerEffectController effect, AudioMixerGroupContr
 
         public void OnSubAssetChanged()
         {
+            AssetDatabase.SaveAssets();
             AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(this));
         }