Update Program.cs

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

@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071</NoWarn>
+    <NoWarn>1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Data.cs" />

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -47,6 +47,7 @@ public class PlayerBuildConfig
         public string ApplicationIdentifier;
         public string Architecture;
         public ScriptingBackend ScriptingBackend;
+        public bool NoGUID;
         public bool InstallIntoBuildsFolder;
         public bool GenerateIdeProject;
         public bool Development;
@@ -60,6 +61,7 @@ public class PlayerBuildConfig
     public class BuiltFilesOutput
     {
         public string[] Files = new string[0];
+        public string BootConfigArtifact;
     }
 
     public class LinkerConfig
@@ -97,6 +99,8 @@ public class Il2CppConfig
         public string SysRootPath;
         public string ToolChainPath;
         public string RelativeDataPath;
+        public bool GenerateUsymFile;
+        public string UsymtoolPath;
     }
 
     public class Services

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

@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071</NoWarn>
+    <NoWarn>1701</NoWarn>
     <AssemblyName>PlayerBuildProgramLibrary.Data</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

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

@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071</NoWarn>
+    <NoWarn>1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Data.cs" />

Editor/Mono/ActiveEditorTracker.bindings.cs

@@ -59,7 +59,7 @@ public override int GetHashCode()
         public Editor[] activeEditors { get { return (Editor[])Internal_GetActiveEditors(this); } }
 
         [FreeFunction]
-        internal static extern void Internal_GetActiveEditorsNonAlloc(ActiveEditorTracker self, Editor[] editors);
+        internal static extern void Internal_GetActiveEditorsNonAlloc(ActiveEditorTracker self, [Unmarshalled] Editor[] editors);
 
         // List<T> version
         internal void GetObjectsLockedByThisTracker(List<UnityObject> lockedObjects)

Editor/Mono/Animation/AnimationUtility.bindings.cs

@@ -134,7 +134,7 @@ public static AnimationClip[] GetAnimationClips(GameObject gameObject)
         extern internal static AnimationClip[] GetAnimationClipsInAnimationPlayer([NotNull] GameObject gameObject);
 
         // Sets the array of AnimationClips to be referenced in the Animation component
-        extern public static void SetAnimationClips([NotNull] Animation animation, AnimationClip[] clips);
+        extern public static void SetAnimationClips([NotNull] Animation animation, [Unmarshalled] AnimationClip[] clips);
 
         public static EditorCurveBinding[] GetAnimatableBindings(GameObject targetObject, GameObject root)
         {
@@ -201,7 +201,7 @@ public static Type PropertyModificationToEditorCurveBinding(PropertyModification
 
         extern public static ObjectReferenceKeyframe[] GetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding);
 
-        public static void SetObjectReferenceCurve(AnimationClip clip, EditorCurveBinding binding, ObjectReferenceKeyframe[] keyframes)
+        public static void SetObjectReferenceCurve(AnimationClip clip, EditorCurveBinding binding, [Unmarshalled]ObjectReferenceKeyframe[] keyframes)
         {
             Internal_SetObjectReferenceCurve(clip, binding, keyframes, true);
             Internal_InvokeOnCurveWasModified(clip, binding, keyframes != null ? CurveModifiedType.CurveModified : CurveModifiedType.CurveDeleted);
@@ -232,7 +232,7 @@ internal static void SetObjectReferenceCurveNoSync(AnimationClip clip, EditorCur
         }
 
         [NativeThrows]
-        extern private static void Internal_SetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, ObjectReferenceKeyframe[] keyframes, bool updateMuscleClip);
+        extern private static void Internal_SetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, [Unmarshalled] ObjectReferenceKeyframe[] keyframes, bool updateMuscleClip);
 
         extern public static AnimationCurve GetEditorCurve([NotNull] AnimationClip clip, EditorCurveBinding binding);
 
@@ -270,6 +270,8 @@ internal static void SetEditorCurveNoSync(AnimationClip clip, EditorCurveBinding
         [NativeThrows]
         extern private static void Internal_SetEditorCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, AnimationCurve curve, bool syncEditorCurves);
 
+        extern internal static bool IsDiscreteIntBinding(EditorCurveBinding binding);
+
         extern internal static void SyncEditorCurves([NotNull] AnimationClip clip);
 
         private static void Internal_InvokeOnCurveWasModified(AnimationClip clip, EditorCurveBinding binding, CurveModifiedType type)

Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs

@@ -920,7 +920,7 @@ private List<AnimationWindowKeyframe> GetKeys(PropertyModification[] modificatio
                     int keyIndex = curve.GetKeyframeIndex(state.time);
                     if (keyIndex >= 0)
                     {
-                        keys.Add(curve.m_Keyframes[keyIndex]);
+                        keys.Add(curve.keyframes[keyIndex]);
                     }
                 }
             }

Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs

@@ -15,7 +15,7 @@ internal class AnimationWindowCurve : IComparable<AnimationWindowCurve>, IEquata
     {
         public const float timeEpsilon = 0.00001f;
 
-        public List<AnimationWindowKeyframe> m_Keyframes;
+        private List<AnimationWindowKeyframe> m_Keyframes;
 
         private EditorCurveBinding m_Binding;
         private int m_BindingHashCode;
@@ -46,6 +46,8 @@ internal class AnimationWindowCurve : IComparable<AnimationWindowCurve>, IEquata
         public bool animationIsEditable { get { return m_SelectionBinding != null ? m_SelectionBinding.animationIsEditable : true; } }
         public int selectionID { get { return m_SelectionBinding != null ? m_SelectionBinding.id : 0; } }
 
+        public IReadOnlyList<AnimationWindowKeyframe> keyframes => m_Keyframes;
+
         private object defaultValue
         {
             get
@@ -190,17 +192,10 @@ public AnimationCurve ToAnimationCurve()
             AnimationCurve animationCurve = new AnimationCurve();
             List<Keyframe> keys = new List<Keyframe>();
 
-            float lastFrameTime = float.MinValue;
-
             for (int i = 0; i < length; i++)
             {
-                // Make sure we don't get two keyframes in an exactly the same time. We just ignore those.
-                if (Mathf.Abs(m_Keyframes[i].time - lastFrameTime) > AnimationWindowCurve.timeEpsilon)
-                {
-                    Keyframe newKeyframe = m_Keyframes[i].ToKeyframe();
-                    keys.Add(newKeyframe);
-                    lastFrameTime = m_Keyframes[i].time;
-                }
+                Keyframe newKeyframe = m_Keyframes[i].ToKeyframe();
+                keys.Add(newKeyframe);
             }
 
             animationCurve.keys = keys.ToArray();
@@ -212,17 +207,10 @@ public ObjectReferenceKeyframe[] ToObjectCurve()
             int length = m_Keyframes.Count;
             List<ObjectReferenceKeyframe> keys = new List<ObjectReferenceKeyframe>();
 
-            float lastFrameTime = float.MinValue;
-
             for (int i = 0; i < length; i++)
             {
-                // Make sure we don't get two keyframes in an exactly the same time. We just ignore those.
-                if (Mathf.Abs(m_Keyframes[i].time - lastFrameTime) > AnimationWindowCurve.timeEpsilon)
-                {
-                    ObjectReferenceKeyframe newKeyframe = m_Keyframes[i].ToObjectReferenceKeyframe();
-                    lastFrameTime = newKeyframe.time;
-                    keys.Add(newKeyframe);
-                }
+                ObjectReferenceKeyframe newKeyframe = m_Keyframes[i].ToObjectReferenceKeyframe();
+                keys.Add(newKeyframe);
             }
 
             keys.Sort((a, b) => a.time.CompareTo(b.time));
@@ -301,6 +289,11 @@ public void RemoveKeyframe(AnimationKeyTime time)
             }
         }
 
+        public void RemoveKeyframe(AnimationWindowKeyframe keyframe)
+        {
+            m_Keyframes.Remove(keyframe);
+        }
+
         public bool HasKeyframe(AnimationKeyTime time)
         {
             return GetKeyframeIndex(time) != -1;

Editor/Mono/Animation/AnimationWindow/AnimationWindowEvent.cs

@@ -13,10 +13,46 @@
 
 namespace UnityEditor
 {
-    internal struct AnimationWindowEventMethod
+    /// <summary>
+    /// Holds the context for AnimationEvent editing.
+    /// </summary>
+    class AnimationEventEditorState
     {
-        public string name;
-        public Type parameterType;
+        static bool s_ShowOverloadedFunctionsDetails = true;
+        static bool s_ShowDuplicatedFunctionsDetails = true;
+
+        bool m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails;
+        bool m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails;
+
+        /// <summary>
+        /// Used to track whether or not to show extra details about duplicated function names found in among the potential supported functions
+        /// </summary>
+        public bool ShowOverloadedFunctionsDetails
+        {
+            get => m_ShowOverloadedFunctionsDetails;
+            set
+            {
+                m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails = value;
+            }
+        }
+
+        /// <summary>
+        /// Used to track whether or not to show extra details about overloaded function names found in among the potential supported functions
+        /// </summary>
+        public bool ShowDuplicatedFunctionsDetails
+        {
+            get => m_ShowDuplicatedFunctionsDetails;
+            set
+            {
+                m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails = value;
+            }
+        }
+
+        public AnimationEventEditorState()
+        {
+            m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails;
+            m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails;
+        }
     }
 
     internal class AnimationWindowEvent : ScriptableObject