Unity 2020.2.0a19 C# reference source code

Author: Unity Technologies

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

@@ -610,11 +610,15 @@ private void HandleTextureSettingUI()
                 EditorGUI.indentLevel--;
 
                 if (m_SelectedPlatformSettings == 0)
+                {
+                    GUILayout.Space(EditorGUI.kSpacing);
                     HandlePlatformSettingUI(null);
+                }
                 else
                 {
                     EditorGUILayout.BeginVertical();
                     {
+                        GUILayout.Space(EditorGUI.kSpacing);
                         string oldSecondaryTextureName = m_PlatformSettingsOptions[m_SelectedPlatformSettings];
                         GUI.SetNextControlName(s_Styles.secondaryTextureNameTextControlName);
 

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

@@ -532,11 +532,15 @@ private void HandleTextureSettingUI()
                 EditorGUI.indentLevel--;
 
                 if (m_SelectedPlatformSettings == 0)
+                {
+                    GUILayout.Space(EditorGUI.kSpacing);
                     HandlePlatformSettingUI(null);
+                }
                 else
                 {
                     EditorGUILayout.BeginVertical();
                     {
+                        GUILayout.Space(EditorGUI.kSpacing);
                         string oldSecondaryTextureName = m_PlatformSettingsOptions[m_SelectedPlatformSettings];
                         GUI.SetNextControlName(s_Styles.secondaryTextureNameTextControlName);
 

Editor/Mono/AssetDatabase/AssetDatabase.deprecated.cs

@@ -4,6 +4,9 @@
 
 using System;
 using System.Runtime.InteropServices;
+using UnityEngine;
+using UnityEditor.AssetImporters;
+using UnityEngine.Bindings;
 
 namespace UnityEditor
 {
@@ -50,3 +53,98 @@ public sealed class AssetsItem
     }
 }
 
+namespace UnityEditor.Experimental
+{
+    public partial class AssetDatabaseExperimental
+    {
+        [FreeFunction("AssetDatabase::ClearImporterOverride")]
+        [Obsolete("AssetDatabaseExperimental.ClearImporterOverride() has been deprecated. Use AssetDatabase.ClearImporterOverride() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.ClearImporterOverride(*)", false)]
+        extern public static void ClearImporterOverride(string path);
+
+        [FreeFunction("AssetDatabase::IsCacheServerEnabled")]
+        [Obsolete("AssetDatabaseExperimental.IsCacheServerEnabled() has been deprecated. Use AssetDatabase.IsCacheServerEnabled() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.IsCacheServerEnabled(*)", false)]
+        public extern static bool IsCacheServerEnabled();
+
+        [Obsolete("AssetDatabaseExperimental.SetImporterOverride<T>() has been deprecated. Use AssetDatabase.SetImporterOverride<T>() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.SetImporterOverride<T>(*)", false)]
+        public static void SetImporterOverride<T>(string path)
+            where T : ScriptedImporter
+        {
+            AssetDatabase.SetImporterOverrideInternal(path, typeof(T));
+        }
+
+        [FreeFunction("AssetDatabase::GetImporterOverride")]
+        [Obsolete("AssetDatabaseExperimental.GetImporterOverride() has been deprecated. Use AssetDatabase.GetImporterOverride() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.GetImporterOverride(*)", false)]
+        extern public static System.Type GetImporterOverride(string path);
+
+        [FreeFunction("AssetDatabase::GetAvailableImporterTypes")]
+        [Obsolete("AssetDatabaseExperimental.GetAvailableImporterTypes() has been deprecated. Use AssetDatabase.GetAvailableImporterTypes() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.GetAvailableImporterTypes(*)", false)]
+        extern public static Type[] GetAvailableImporterTypes(string path);
+
+        [FreeFunction("AcceleratorClientCanConnectTo")]
+        [Obsolete("AssetDatabaseExperimental.CanConnectToCacheServer() has been deprecated. Use AssetDatabase.CanConnectToCacheServer() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.CanConnectToCacheServer(*)", false)]
+        public extern static bool CanConnectToCacheServer(string ip, UInt16 port);
+
+        [FreeFunction()]
+        [Obsolete("AssetDatabaseExperimental.RefreshSettings() has been deprecated. Use AssetDatabase.RefreshSettings() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.RefreshSettings(*)", false)]
+        public extern static void RefreshSettings();
+
+        [Obsolete("AssetDatabaseExperimental.CacheServerConnectionChangedParameters has been deprecated. Use UnityEditor.CacheServerConnectionChangedParameters instead (UnityUpgradable) -> UnityEditor.CacheServerConnectionChangedParameters", false)]
+        public struct CacheServerConnectionChangedParameters
+        {
+        }
+
+#pragma warning disable 67
+        [Obsolete("AssetDatabaseExperimental.cacheServerConnectionChanged has been deprecated. Use AssetDatabase.cacheServerConnectionChanged instead (UnityUpgradable) -> UnityEditor.AssetDatabase.cacheServerConnectionChanged", false)]
+        public static event Action<CacheServerConnectionChangedParameters> cacheServerConnectionChanged;
+#pragma warning restore 67
+
+        [FreeFunction("IsConnectedToCacheServerV2")]
+        [Obsolete("AssetDatabaseExperimental.IsConnectedToCacheServer() has been deprecated. Use AssetDatabase.IsConnectedToCacheServer() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.IsConnectedToCacheServer(*)", false)]
+        public extern static bool IsConnectedToCacheServer();
+
+        [FreeFunction()]
+        [Obsolete("AssetDatabaseExperimental.GetCacheServerAddress() has been deprecated. Use AssetDatabase.GetCacheServerAddress() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.GetCacheServerAddress(*)", false)]
+        public extern static string GetCacheServerAddress();
+
+        [FreeFunction()]
+        [Obsolete("AssetDatabaseExperimental.GetCacheServerPort() has been deprecated. Use AssetDatabase.GetCacheServerPort() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.GetCacheServerPort(*)", false)]
+        public extern static UInt16 GetCacheServerPort();
+
+        [FreeFunction("AssetDatabase::GetCacheServerNamespacePrefix")]
+        [Obsolete("AssetDatabaseExperimental.GetCacheServerNamespacePrefix() has been deprecated. Use AssetDatabase.GetCacheServerNamespacePrefix() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.GetCacheServerNamespacePrefix(*)", false)]
+        public extern static string GetCacheServerNamespacePrefix();
+
+        [FreeFunction("AssetDatabase::GetCacheServerEnableDownload")]
+        [Obsolete("AssetDatabaseExperimental.GetCacheServerEnableDownload() has been deprecated. Use AssetDatabase.GetCacheServerEnableDownload() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.GetCacheServerEnableDownload(*)", false)]
+        public extern static bool GetCacheServerEnableDownload();
+
+        [FreeFunction("AssetDatabase::GetCacheServerEnableUpload")]
+        [Obsolete("AssetDatabaseExperimental.GetCacheServerEnableUpload() has been deprecated. Use AssetDatabase.GetCacheServerEnableUpload() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.GetCacheServerEnableUpload(*)", false)]
+        public extern static bool GetCacheServerEnableUpload();
+
+        [FreeFunction("AssetDatabase::IsDirectoryMonitoringEnabled")]
+        [Obsolete("AssetDatabaseExperimental.IsDirectoryMonitoringEnabled() has been deprecated. Use AssetDatabase.IsDirectoryMonitoringEnabled() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.IsDirectoryMonitoringEnabled(*)", false)]
+        public extern static bool IsDirectoryMonitoringEnabled();
+
+        [FreeFunction("AssetDatabaseExperimental::RegisterCustomDependency")]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kPreventCustomDependencyChanges, PreventExecutionSeverity.PreventExecution_ManagedException, "Custom dependencies can only be removed when the assetdatabase is not importing.")]
+        [Obsolete("AssetDatabaseExperimental.RegisterCustomDependency() has been deprecated. Use AssetDatabase.RegisterCustomDependency() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.RegisterCustomDependency(*)", false)]
+        public extern static void RegisterCustomDependency(string dependency, Hash128 hashOfValue);
+
+        [FreeFunction("AssetDatabaseExperimental::UnregisterCustomDependencyPrefixFilter")]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kPreventCustomDependencyChanges, PreventExecutionSeverity.PreventExecution_ManagedException, "Custom dependencies can only be removed when the assetdatabase is not importing.")]
+        [Obsolete("AssetDatabaseExperimental.UnregisterCustomDependencyPrefixFilter() has been deprecated. Use AssetDatabase.UnregisterCustomDependencyPrefixFilter() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.UnregisterCustomDependencyPrefixFilter(*)", false)]
+        public extern static UInt32 UnregisterCustomDependencyPrefixFilter(string prefixFilter);
+
+        [FreeFunction("AssetDatabase::IsAssetImportProcess")]
+        [Obsolete("AssetDatabaseExperimental.IsAssetImportWorkerProcess() has been deprecated. Use AssetDatabase.IsAssetImportWorkerProcess()", false)]
+        public extern static bool IsAssetImportWorkerProcess();
+
+        [Obsolete("Has been replaced by AssetDatabaseExperimental.RefreshSettings", true)]
+        public static void ReconnectToCacheServer()
+        {
+            throw new NotSupportedException("Please use AssetdatabaseExperimental.RefreshSettings instead.");
+        }
+    }
+}
+

Editor/Mono/BuildPipeline/AssemblyStripper.cs

@@ -642,7 +642,7 @@ private static void GetUnityLinkerPlatformStringsFromBuildTarget(BuildTarget tar
                         break;
                     case BuildTarget.StandaloneOSX:
                         platform = "MacOSX";
-                        architecture = "x64";
+                        architecture = "";
                         break;
                     case BuildTarget.WSAPlayer:
                         platform = "WinRT";

Editor/Mono/BuildPipeline/BuildPlatform.cs

@@ -116,7 +116,7 @@ public string GetBuildTargetDisplayName(BuildTargetGroup group, BuildTarget targ
                 case BuildTarget.StandaloneOSXIntel:
                 case BuildTarget.StandaloneOSXIntel64:
 #pragma warning restore 612, 618
-                    return "Mac OS X";
+                    return "macOS";
                     // Deprecated
 #pragma warning disable 612, 618
                 case BuildTarget.StandaloneLinux:

Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs

@@ -40,7 +40,7 @@ private void SetupStandaloneSubtargets()
         if (ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneOSX))
         {
             standaloneSubtargetsList.Add(BuildTarget.StandaloneOSX);
-            standaloneSubtargetStringsList.Add(EditorGUIUtility.TrTextContent("Mac OS X"));
+            standaloneSubtargetStringsList.Add(EditorGUIUtility.TrTextContent("macOS"));
         }
         if (ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneLinux64))
         {

Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs

@@ -105,6 +105,9 @@ private void CopyNativePlugins(BuildPostProcessArgs args, BuildTarget buildTarge
 
         foreach (PluginImporter imp in PluginImporter.GetImporters(buildTarget))
         {
+            if (!IsPluginCompatibleWithCurrentBuild(buildTarget, imp))
+                continue;
+
             // Skip .cpp files. They get copied to il2cpp output folder just before code compilation
             if (DesktopPluginImporterExtension.IsCppPluginFile(imp.assetPath))
             {
@@ -182,6 +185,12 @@ private void CopyNativePlugins(BuildPostProcessArgs args, BuildTarget buildTarge
         }
     }
 
+    protected virtual bool IsPluginCompatibleWithCurrentBuild(BuildTarget buildTarget, PluginImporter imp)
+    {
+        var cpu = imp.GetPlatformData(buildTarget, "CPU");
+        return !string.Equals(cpu, "None", StringComparison.OrdinalIgnoreCase);
+    }
+
     private void CopyCppPlugins(BuildPostProcessArgs args, string cppOutputDir, IEnumerable<string> cppPlugins)
     {
         if (GetCreateSolution(args))
@@ -224,7 +233,7 @@ private void SetupStagingArea(BuildPostProcessArgs args, HashSet<string> filesTo
             if (UseIl2Cpp)
             {
                 var il2cppPlatformProvider = GetPlatformProvider(args);
-                IL2CPPUtils.RunIl2Cpp(args.stagingAreaData, il2cppPlatformProvider, (cppOutputDir) => CopyCppPlugins(args, cppOutputDir, cppPlugins), args.usedClassRegistry);
+                RunIL2CPP(args, il2cppPlatformProvider, cppPlugins);
 
                 if (GetCreateSolution(args))
                 {
@@ -246,6 +255,11 @@ private void SetupStagingArea(BuildPostProcessArgs args, HashSet<string> filesTo
         }
     }
 
+    protected virtual void RunIL2CPP(BuildPostProcessArgs args, IIl2CppPlatformProvider il2cppPlatformProvider, List<string> cppPlugins)
+    {
+        IL2CPPUtils.RunIl2Cpp(args.stagingAreaData, il2cppPlatformProvider, (cppOutputDir) => CopyCppPlugins(args, cppOutputDir, cppPlugins), args.usedClassRegistry);
+    }
+
     private void ProcessIl2CppOutputForBinary(BuildPostProcessArgs args)
     {
         // Move GameAssembly next to game executable
@@ -375,8 +389,9 @@ protected bool CopyPlayerFilter(string path, BuildPostProcessArgs args)
     {
         // Don't copy assemblies that are being overridden by a User assembly.
         var fileName = Path.GetFileName(path);
-        for (int i = 0; i < args.report.files.Length; ++i)
-            if (Path.GetFileName(args.report.files[i].path) == fileName && args.report.files[i].isOverridingUnityAssembly)
+        var files = args.report.files;
+        for (var i = 0; i < files.Length; ++i)
+            if (Path.GetFileName(files[i].path) == fileName && files[i].isOverridingUnityAssembly)
                 return false;
 
         // Don't copy UnityEngine mdb/pdb files
@@ -507,9 +522,13 @@ protected static bool IsHeadlessMode(BuildPostProcessArgs args)
         return ((args.options & BuildOptions.EnableHeadlessMode) != 0);
     }
 
-    protected virtual string GetVariationName(BuildPostProcessArgs args)
+    protected string GetVariationName(BuildPostProcessArgs args)
+    {
+        return GetVariationName(args, PlatformStringFor(args.target));
+    }
+
+    protected virtual string GetVariationName(BuildPostProcessArgs args, string platformString)
     {
-        var platformString = PlatformStringFor(args.target);
         var configurationString = GetDevelopment(args) ? "development" : "nondevelopment";
 
         var scriptingBackend = "mono";