Merge branch 'master' into muxtestinfra

Author: michael-hawker

Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml

@@ -9,7 +9,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:ImageEx">
-                    <Grid Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                    <Grid Background="{TemplateBinding Background}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}">
                         <Image Name="PlaceholderImage"
                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                VerticalAlignment="{TemplateBinding VerticalAlignment}"

Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs

@@ -20,11 +20,6 @@ public partial class ImageExBase
         /// </summary>
         public static readonly DependencyProperty StretchProperty = DependencyProperty.Register(nameof(Stretch), typeof(Stretch), typeof(ImageExBase), new PropertyMetadata(Stretch.Uniform));
 
-        /// <summary>
-        /// Identifies the <see cref="CornerRadius"/> dependency property.
-        /// </summary>
-        public static new readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(nameof(CornerRadius), typeof(CornerRadius), typeof(ImageExBase), new PropertyMetadata(new CornerRadius(0)));
-
         /// <summary>
         /// Identifies the <see cref="DecodePixelHeight"/> dependency property.
         /// </summary>
@@ -81,16 +76,6 @@ public partial class ImageExBase
         /// </summary>
         public bool IsInitialized { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the CornerRadius for underlying image. <para/>
-        /// Used to created rounded/circular images.
-        /// </summary>
-        public new CornerRadius CornerRadius
-        {
-            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
-            set { SetValue(CornerRadiusProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets DecodePixelHeight for underlying bitmap
         /// </summary>