More attempts at repro #354

Author: JohanLarsson

WpfAnalyzers.Test/WPF0010DefaultValueMustMatchRegisteredTypeTests/Valid.cs

@@ -663,7 +663,7 @@ public Geometry IconGeometry
         [Test]
         public static void SubTypeIssue354()
         {
-            var code = @"
+            var typeA = @"
 namespace ValidCode.Repro
 {
     using System.Windows;
@@ -680,7 +680,15 @@ public Geometry IconGeometry
 
         public static readonly DependencyProperty IconGeometryProperty =
             DependencyProperty.Register(nameof(IconGeometry), typeof(Geometry), typeof(TypeA), new PropertyMetadata(null));
-    }
+    }	
+}";
+
+            var typeB = @"
+namespace ValidCode.Repro
+{
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Media;
 	
     public class TypeB : Image
     {
@@ -697,7 +705,7 @@ public Geometry IconGeometry
     }	
 }";
 
-            RoslynAssert.Valid(Analyzer, Descriptors.WPF0010DefaultValueMustMatchRegisteredType, code);
+            RoslynAssert.Valid(Analyzer, Descriptors.WPF0010DefaultValueMustMatchRegisteredType, typeA, typeB);
         }
     }
 }

WpfAnalyzers.Test/WPF0014SetValueMustUseRegisteredTypeTests/Valid.cs

@@ -1091,5 +1091,53 @@ public void M(Issue278 control, Color? color = null)
 
             RoslynAssert.Valid(Analyzer, code);
         }
+
+        [Test]
+        public static void SubTypeIssue354()
+        {
+            var typeA = @"
+namespace ValidCode.Repro
+{
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Media;
+
+    public class TypeA : Image
+    {
+        public Geometry IconGeometry
+        {
+            get => (Geometry)GetValue(IconGeometryProperty);
+            set => SetValue(IconGeometryProperty, value);
+        }
+
+        public static readonly DependencyProperty IconGeometryProperty =
+            DependencyProperty.Register(nameof(IconGeometry), typeof(Geometry), typeof(TypeA), new PropertyMetadata(null));
+    }	
+}";
+
+            var typeB = @"
+namespace ValidCode.Repro
+{
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Media;
+	
+    public class TypeB : Image
+    {
+        public Geometry IconGeometry
+        {
+            get => (Geometry)GetValue(IconGeometryProperty);
+            // WPF0014 SetValue must use registered type System.Windows.Media.Geometry
+            set => SetValue(IconGeometryProperty, value);
+        }
+
+        public static readonly DependencyProperty IconGeometryProperty =
+            // WPF0010 Default value for 'TypeA.IconGeometryProperty' must be of type System.Windows.Media.Geometry
+            TypeA.IconGeometryProperty.AddOwner(typeof(TypeB), new FrameworkPropertyMetadata(new EllipseGeometry(default, 5, 5)));
+    }	
+}";
+
+            RoslynAssert.Valid(Analyzer, typeA, typeB);
+        }
     }
 }