Upstream Source

Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+ <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+ <PropertyGroup>
+ <AssemblyName>BeeBuildProgramCommon.Data</AssemblyName>
+ <TargetFramework>netstandard2.1</TargetFramework>
+ <GenerateDocumentationFile>false</GenerateDocumentationFile>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <EnableDefaultItems>false</EnableDefaultItems>
+ <LangVersion>latest</LangVersion>
+ <NoWarn>1701</NoWarn>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="Data.cs" />
+ </ItemGroup>
+ <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>

Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs

@@ -0,0 +1,41 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace BeeBuildProgramCommon.Data
+{
+ public class PackageInfo
+ {
+ public string Name;
+ public string ResolvedPath;
+ }
+
+ public struct Version
+ {
+ public int Release, Major, Minor;
+
+ public Version(int release, int major, int minor)
+ {
+ Release = release;
+ Major = major;
+ Minor = minor;
+ }
+ }
+
+ public class ConfigurationData
+ {
+ public string Il2CppDir;
+ public string UnityLinkerPath;
+ public string Il2CppPath;
+ public string NetCoreRunPath;
+ public string DotNetExe;
+ public string EditorContentsPath;
+ public PackageInfo[] Packages;
+ public string UnityVersion;
+ public Version UnityVersionNumeric;
+ public string UnitySourceCodePath;
+ public bool Batchmode;
+ public bool EmitDataForBeeWhy;
+ public string NamedPipeOrUnixSocket;
+ }
+}

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -0,0 +1,132 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace PlayerBuildProgramLibrary.Data
+{
+ public class Plugin
+ {
+ public string AssetPath;
+ public string DestinationPath;
+ public string Architecture;
+ public string CompileFlags;
+ public bool AddToEmbeddedBinaries;
+ public override string ToString()
+ {
+ return $"'{AssetPath} -> '{DestinationPath}' ({Architecture})";
+ }
+ }
+
+ public class PluginsData
+ {
+ public Plugin[] Plugins = new Plugin[0];
+ }
+
+ public class GenerateNativePluginsForAssembliesArgs
+ {
+ public string PluginOutputFolder;
+ public string SymbolOutputFolder;
+ public string[] Assemblies;
+ }
+
+ public class GenerateNativePluginsForAssembliesSettings
+ {
+ public bool HasCallback;
+ public string DisplayName;
+ public string[] AdditionalInputFiles = new string[0];
+ }
+
+ public class PlayerBuildConfig
+ {
+ public string DestinationPath;
+ public string StagingArea;
+ public string DataFolder;
+ public string CompanyName;
+ public string ProductName;
+ public string PlayerPackage;
+ public string ApplicationIdentifier;
+ public string Architecture;
+ public ScriptingBackend ScriptingBackend;
+ public bool NoGUID;
+ public bool InstallIntoBuildsFolder;
+ public bool GenerateIdeProject;
+ public bool Development;
+ public bool UseNewInputSystem;
+ public GenerateNativePluginsForAssembliesSettings GenerateNativePluginsForAssembliesSettings;
+ public Services Services;
+ public string[] ManagedAssemblies;
+ public StreamingAssetsFile[] StreamingAssetsFiles;
+ }
+
+ public class BuiltFilesOutput
+ {
+ public string[] Files = new string[0];
+ public string BootConfigArtifact;
+ }
+
+ public class LinkerConfig
+ {
+ public string[] LinkXmlFiles = new string[0];
+ public string[] AssembliesToProcess = new string[0];
+ public string EditorToLinkerData;
+ public string Runtime;
+ public string Profile;
+ public string Ruleset;
+ public string ModulesAssetPath;
+ public string[] AdditionalArgs = new string[0];
+ public bool AllowDebugging;
+ public bool PerformEngineStripping;
+ }
+
+ public class Il2CppConfig
+ {
+ public bool EnableDeepProfilingSupport;
+ public bool EnableFullGenericSharing;
+ public string Profile;
+ public string[] IDEProjectDefines;
+
+ public string ConfigurationName;
+ public bool GcWBarrierValidation;
+ public bool GcIncremental;
+
+ public string[] AdditionalCppFiles = new string[0];
+ public string[] AdditionalArgs = new string[0];
+ public string CompilerFlags;
+ public string[] AdditionalLibraries;
+ public string[] AdditionalDefines;
+ public string[] AdditionalIncludeDirectories;
+ public string[] AdditionalLinkDirectories;
+ public string LinkerFlags;
+ public string LinkerFlagsFile;
+ public string ExtraTypes;
+ public bool CreateSymbolFiles;
+ public bool AllowDebugging;
+ public string SysRootPath;
+ public string ToolChainPath;
+ public string RelativeDataPath;
+ public bool GenerateUsymFile;
+ public string UsymtoolPath;
+ }
+
+ public class Services
+ {
+ public bool EnableUnityConnect;
+ public bool EnablePerformanceReporting;
+ public bool EnableAnalytics;
+ public bool EnableCrashReporting;
+ public bool EnableInsights;
+ }
+
+ public class StreamingAssetsFile
+ {
+ public string File;
+ public string RelativePath;
+ }
+
+ public enum ScriptingBackend
+ {
+ Mono,
+ IL2CPP,
+ CoreCLR,
+ }
+}

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+ <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+ <PropertyGroup>
+ <AssemblyName>PlayerBuildProgramLibrary.Data</AssemblyName>
+ <TargetFramework>netstandard2.1</TargetFramework>
+ <GenerateDocumentationFile>false</GenerateDocumentationFile>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <EnableDefaultItems>false</EnableDefaultItems>
+ <LangVersion>latest</LangVersion>
+ <NoWarn>1701</NoWarn>
+ <AssemblyName>PlayerBuildProgramLibrary.Data</AssemblyName>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="Data.cs" />
+ <ProjectReference Include="../BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj" />
+ </ItemGroup>
+ <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>

Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs

@@ -0,0 +1,68 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace ScriptCompilationBuildProgram.Data
+{
+ public static class Constants
+ {
+ public const string ScriptAssembliesTarget = "ScriptAssemblies";
+ public const string ScriptAssembliesAndTypeDBTarget = "ScriptAssembliesAndTypeDB";
+ public const string MovedFromExtension = "mvfrm";
+ }
+
+ public class ScriptCompilationData
+ {
+ public AssemblyData[] Assemblies;
+ public AssemblyData[] CodegenAssemblies;
+ public string DotnetRuntimePath;
+ public string DotnetRoslynPath;
+ public string MovedFromExtractorPath;
+ public string OutputDirectory;
+ public bool Debug;
+ public string BuildTarget;
+ public string Localization;
+ public string BuildPlayerDataOutput;
+ public bool ExtractRuntimeInitializeOnLoads;
+ public bool EnableDiagnostics;
+ public bool EmitInfoForScriptUpdater;
+ public string[] AssembliesToScanForTypeDB;
+ public string[] SearchPaths;
+ }
+
+ public class AssemblyData
+ {
+ public string Name;
+ public string[] SourceFiles = new string[0];
+ public string[] Defines = new string[0];
+ public string[] PrebuiltReferences = new string[0];
+ public int[] References = new int[0];
+ public bool AllowUnsafeCode;
+ public string RuleSet;
+ public string AnalyzerConfigPath;
+ public string LanguageVersion;
+ public bool UseDeterministicCompilation;
+ public bool SuppressCompilerWarnings;
+ public string[] Analyzers = new string[0];
+ public string[] AdditionalFiles = new string[0];
+ public string Asmdef;
+ public string[] BclDirectories = new string[0];
+ public string[] CustomCompilerOptions = new string[0];
+ public int DebugIndex;
+ public bool SkipCodeGen;
+ public string Path;
+ }
+
+ public class ScriptCompilationData_Out
+ {
+ public AssemblyData_Out[] Assemblies;
+ public bool LocalizeCompilerMessages;
+ }
+
+ public class AssemblyData_Out
+ {
+ public string Path;
+ public string ScriptUpdaterRsp;
+ public string MovedFromExtractorFile;
+ }
+}

Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/ScriptCompilationBuildProgram.Data.gen.csproj

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+ <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+ <PropertyGroup>
+ <AssemblyName>ScriptCompilationBuildProgram.Data</AssemblyName>
+ <TargetFramework>netstandard2.1</TargetFramework>
+ <GenerateDocumentationFile>false</GenerateDocumentationFile>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <EnableDefaultItems>false</EnableDefaultItems>
+ <LangVersion>latest</LangVersion>
+ <NoWarn>1701</NoWarn>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="Data.cs" />
+ <ProjectReference Include="../BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj" />
+ </ItemGroup>
+ <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>

Editor/Mono/2D/Common/ScriptBindings/SpriteEditorExtension.bindings.cs

@@ -3,10 +3,10 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
-using UnityEditor;
 using UnityEngine.Bindings;
+using UnityEngine.U2D;
 
-namespace UnityEditor.Experimental.U2D
+namespace UnityEditor.U2D
 {
  [NativeHeader("Editor/Src/2D/SpriteEditorExtension.h")]
  public static class SpriteEditorExtension
@@ -16,7 +16,18 @@ public static GUID GetSpriteID(this Sprite sprite)
  return new GUID(GetSpriteIDScripting(sprite));
  }
 
- [FreeFunction("SpriteEditorExtension::GetSpriteIDScripting")]
- private static extern string GetSpriteIDScripting(Sprite sprite);
+ public static void SetSpriteID(this Sprite sprite, GUID guid)
+ {
+ SetSpriteIDScripting(sprite, guid.ToString());
+ }
+
+ private static extern string GetSpriteIDScripting([NotNull] Sprite sprite);
+ private static extern void SetSpriteIDScripting([NotNull] Sprite sprite, string spriteID);
+ internal static extern SpriteAtlas GetActiveAtlas([NotNull] this Sprite sprite);
+ internal static extern string GetActiveAtlasName([NotNull] this Sprite sprite);
+ internal static extern Texture2D GetActiveAtlasTexture([NotNull] this Sprite sprite);
+ internal static extern Rect GetActiveAtlasTextureRect([NotNull] this Sprite sprite);
+ internal static extern Vector2 GetActiveAtlasTextureRectOffset([NotNull] this Sprite sprite);
+ internal static extern Texture2D GetActiveAtlasAlphaTexture([NotNull] this Sprite sprite);
  }
 }

Editor/Mono/SpriteEditor/SpriteEditorUtility.cs → Editor/Mono/2D/Common/SpriteEditorUtility.cs

@@ -50,7 +50,7 @@ public static Rect RoundedRect(Rect rect)
  Mathf.RoundToInt(rect.yMin),
  Mathf.RoundToInt(rect.width),
  Mathf.RoundToInt(rect.height)
-  );
+ );
  }
 
  public static Rect RoundToInt(Rect r)
@@ -167,7 +167,7 @@ public static void FourIntFields(Vector2 rectSize, GUIContent label, GUIContent
  fieldRect.width -= EditorGUI.kSpacingSubLabel;
 
  float oldLabelWidth = EditorGUIUtility.labelWidth;
- EditorGUIUtility.labelWidth = EditorGUI.kMiniLabelW;
+ EditorGUIUtility.labelWidth = EditorGUI.CalcPrefixLabelWidth(labelX);
 
  GUI.SetNextControlName("FourIntFields_x");
  x = EditorGUI.IntField(fieldRect, labelX, x);