From 9d3fd84a7acd5c718aa628d3c126912745cf31b7 Mon Sep 17 00:00:00 2001
From: mstr2 <oxmyx@gmx.de>
Date: Tue, 29 Jan 2019 01:16:26 +0100
Subject: [PATCH] Fixes a bug where properties would be added multiple times to
 the global AvaloniaPropertyRegistry._properties list.

---
 src/Avalonia.Base/AvaloniaPropertyRegistry.cs        | 10 +++++++---
 .../AvaloniaPropertyRegistryTests.cs                 | 12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
index 11b1096052..6f57dfbf13 100644
--- a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
@@ -13,7 +13,7 @@ namespace Avalonia
     /// </summary>
     public class AvaloniaPropertyRegistry
     {
-        private readonly IList<AvaloniaProperty> _properties =
+        private readonly List<AvaloniaProperty> _properties =
             new List<AvaloniaProperty>();
         private readonly Dictionary<Type, Dictionary<int, AvaloniaProperty>> _registered =
             new Dictionary<Type, Dictionary<int, AvaloniaProperty>>();
@@ -30,6 +30,11 @@ namespace Avalonia
         public static AvaloniaPropertyRegistry Instance { get; }
             = new AvaloniaPropertyRegistry();
 
+        /// <summary>
+        /// Gets a list of all registered properties.
+        /// </summary>
+        internal IReadOnlyList<AvaloniaProperty> Properties => _properties;
+
         /// <summary>
         /// Gets all non-attached <see cref="AvaloniaProperty"/>s registered on a type.
         /// </summary>
@@ -250,8 +255,7 @@ namespace Avalonia
             {
                 inner.Add(property.Id, property);
             }
-
-            _properties.Add(property);
+            
             _attachedCache.Clear();
         }
     }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
index c34e26ac5c..8220b7d6e7 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
@@ -19,6 +19,18 @@ namespace Avalonia.Base.UnitTests
             p = AttachedOwner.AttachedProperty;
         }
 
+        [Fact]
+        public void Registered_Properties_Count_Reflects_Newly_Added_Attached_Property()
+        {
+            var registry = new AvaloniaPropertyRegistry();
+            var metadata = new StyledPropertyMetadata<int>();
+            var property = new AttachedProperty<int>("test", typeof(object), metadata, true);
+            registry.Register(typeof(object), property);
+            registry.RegisterAttached(typeof(AvaloniaPropertyRegistryTests), property);
+
+            Assert.Equal(1, registry.Properties.Count);
+        }
+
         [Fact]
         public void GetRegistered_Returns_Registered_Properties()
         {