From 89047a2baf9060557db318b38d43a0c971d9d7ca Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 28 Oct 2020 12:47:41 +0000
Subject: [PATCH 1/2] add resolvebyname attribute to attached property setter
 methods for compatibility with resharper.

---
 .../RelativePanel.AttachedProperties.cs              | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs b/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs
index f64c26682b..562b104b04 100644
--- a/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs
+++ b/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs
@@ -55,6 +55,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to position this element above.)</param>
+        [ResolveByName]
         public static void SetAbove(AvaloniaObject obj, object value)
         {
             obj.SetValue(AboveProperty, value);
@@ -121,6 +122,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to align this element's bottom edge with.)</param>
+        [ResolveByName]
         public static void SetAlignBottomWith(AvaloniaObject obj, object value)
         {
             obj.SetValue(AlignBottomWithProperty, value);
@@ -185,6 +187,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to align this element's horizontal center with.)</param>
+        [ResolveByName]
         public static void SetAlignHorizontalCenterWith(AvaloniaObject obj, object value)
         {
             obj.SetValue(AlignHorizontalCenterWithProperty, value);
@@ -250,6 +253,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to align this element's left edge with.)</param>
+        [ResolveByName]
         public static void SetAlignLeftWith(AvaloniaObject obj, object value)
         {
             obj.SetValue(AlignLeftWithProperty, value);
@@ -315,6 +319,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to align this element's right edge with.)</param>
+        [ResolveByName]
         public static void SetAlignRightWith(AvaloniaObject obj, object value)
         {
             obj.SetValue(AlignRightWithProperty, value);
@@ -376,6 +381,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to align this element's top edge with.)</param>
+        [ResolveByName]
         public static void SetAlignTopWith(AvaloniaObject obj, object value)
         {
             obj.SetValue(AlignTopWithProperty, value);
@@ -437,7 +443,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to align this element's horizontal center with.)</param>        
-
+        [ResolveByName]
         public static void SetAlignVerticalCenterWith(AvaloniaObject obj, object value)
         {
             obj.SetValue(AlignVerticalCenterWithProperty, value);
@@ -468,7 +474,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to position this element below.)</param>
-
+        [ResolveByName]
         public static void SetBelow(AvaloniaObject obj, object value)
         {
             obj.SetValue(BelowProperty, value);
@@ -500,6 +506,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to position this element to the left of.)</param>
+        [ResolveByName]
         public static void SetLeftOf(AvaloniaObject obj, object value)
         {
             obj.SetValue(LeftOfProperty, value);
@@ -531,6 +538,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="obj">The object to which the property value is written.</param>
         /// <param name="value">The value to set. (The element to position this element to the right of.)</param>
+        [ResolveByName]
         public static void SetRightOf(AvaloniaObject obj, object value)
         {
             obj.SetValue(RightOfProperty, value);

From 8f51fae0d93a2a345f68528462435d6b55b7d994 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 28 Oct 2020 12:50:45 +0000
Subject: [PATCH 2/2] update comment for ResolveByName attribute.

---
 src/Avalonia.Controls/ResolveByNameAttribute.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ResolveByNameAttribute.cs b/src/Avalonia.Controls/ResolveByNameAttribute.cs
index a00e3f8a1b..a13b10d630 100644
--- a/src/Avalonia.Controls/ResolveByNameAttribute.cs
+++ b/src/Avalonia.Controls/ResolveByNameAttribute.cs
@@ -2,8 +2,12 @@
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Indicates that the property resolves an element by Name or x:Name.
+    /// When applying this to attached properties, ensure to put on both
+    /// the Getter and Setter methods.
+    /// </summary>
     public class ResolveByNameAttribute : Attribute
     {
-
     }
 }