From f4898667345648ac27b08a8e77626fcda6971d0f Mon Sep 17 00:00:00 2001
From: zhouzj <comesx4@gmail.com>
Date: Thu, 1 Dec 2022 16:28:34 +0800
Subject: [PATCH 1/2] Replace ContentControl to ContentPresenter

---
 .../Controls/CalendarButton.xaml               | 16 ++++++++--------
 .../Controls/CalendarButton.xaml               | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index 06b6cf30c2..76b51ca819 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -35,13 +35,13 @@
           <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
           <Border Name="Root" Background="{TemplateBinding Background}"
                   BorderThickness="0" ClipToBounds="True">
-            <ContentControl Name="Content"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            FontSize="{TemplateBinding FontSize}"
-                            Margin="{TemplateBinding Padding}" />
+            <ContentPresenter Name="Content"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              FontSize="{TemplateBinding FontSize}"
+                              Margin="{TemplateBinding Padding}" />
           </Border>
 
           <!-- Drawn Border should render on top of background to preserve the 1px margin between items -->
@@ -70,7 +70,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
       </Style>
 
-      <Style Selector="^ /template/ ContentControl#Content">
+      <Style Selector="^ /template/ ContentPresenter#Content">
         <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
         <Setter Property="FontWeight" Value="SemiBold" />
       </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
index 59fb24663f..9e13e1e996 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
@@ -32,14 +32,14 @@
                      Opacity="0.5" />
 
           <!--  Focusable="False"  -->
-          <ContentControl Name="Content"
-                          Margin="1,0,1,1"
-                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          FontSize="{TemplateBinding FontSize}"
-                          Foreground="{TemplateBinding Foreground}" />
+          <ContentPresenter Name="Content"
+                            Margin="1,0,1,1"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Foreground="{TemplateBinding Foreground}" />
 
           <Rectangle Name="FocusVisual"
                      IsHitTestVisible="False"
@@ -62,7 +62,7 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
-    <Style Selector="^:inactive /template/ ContentControl#Content">
+    <Style Selector="^:inactive /template/ ContentPresenter#Content">
       <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     </Style>
 

From 9be5c31bb0125194739268b7d831b31d3f9a3b13 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 1 Dec 2022 18:11:46 +0100
Subject: [PATCH 2/2] fix: XML Document CA1574

---
 src/Avalonia.Base/Animation/CrossFade.cs                  | 2 +-
 src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs     | 2 +-
 src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs   | 2 +-
 src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs | 2 +-
 src/Avalonia.Base/Media/MatrixTransform.cs                | 2 +-
 src/Avalonia.Base/Media/RotateTransform.cs                | 2 +-
 src/Avalonia.Base/Media/ScaleTransform.cs                 | 2 +-
 src/Avalonia.Base/Media/SkewTransform.cs                  | 2 +-
 src/Avalonia.Base/Media/Transform.cs                      | 2 +-
 src/Avalonia.Base/Media/TranslateTransform.cs             | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs      | 2 +-
 src/Avalonia.Base/Styling/Activators/IStyleActivator.cs   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Base/Animation/CrossFade.cs b/src/Avalonia.Base/Animation/CrossFade.cs
index 608a0880ec..a229bc7ce6 100644
--- a/src/Avalonia.Base/Animation/CrossFade.cs
+++ b/src/Avalonia.Base/Animation/CrossFade.cs
@@ -10,7 +10,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Animation
 {
     /// <summary>
-    /// Defines a cross-fade animation between two <see cref="IVisual"/>s.
+    /// Defines a cross-fade animation between two <see cref="Visual"/>s.
     /// </summary>
     public class CrossFade : IPageTransition
     {
diff --git a/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
index c4508c3f5c..d56711ad68 100644
--- a/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
+++ b/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
@@ -7,7 +7,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media.Imaging
 {
     /// <summary>
-    /// A bitmap that holds the rendering of a <see cref="IVisual"/>.
+    /// A bitmap that holds the rendering of a <see cref="Visual"/>.
     /// </summary>
     public class RenderTargetBitmap : Bitmap, IDisposable, IRenderTarget
     {
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
index d5ff2b8317..4478504eca 100644
--- a/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
@@ -3,7 +3,7 @@
 namespace Avalonia.Media.Immutable
 {
     /// <summary>
-    /// Represents a transform on an <see cref="IVisual"/>.
+    /// Represents a transform on an <see cref="Visual"/>.
     /// </summary>
     public class ImmutableTransform : ITransform
     {
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
index 1e0133c9b7..9b443391c5 100644
--- a/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media.Immutable
 {
     /// <summary>
-    /// Paints an area with an <see cref="IVisual"/>.
+    /// Paints an area with an <see cref="Visual"/>.
     /// </summary>
     internal class ImmutableVisualBrush : ImmutableTileBrush, IVisualBrush
     {
diff --git a/src/Avalonia.Base/Media/MatrixTransform.cs b/src/Avalonia.Base/Media/MatrixTransform.cs
index 4e60e1e290..c61acb730c 100644
--- a/src/Avalonia.Base/Media/MatrixTransform.cs
+++ b/src/Avalonia.Base/Media/MatrixTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Transforms an <see cref="IVisual"/> according to a <see cref="Matrix"/>.
+    /// Transforms an <see cref="Visual"/> according to a <see cref="Matrix"/>.
     /// </summary>
     public class MatrixTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/RotateTransform.cs b/src/Avalonia.Base/Media/RotateTransform.cs
index 126bb7c274..3bd409149c 100644
--- a/src/Avalonia.Base/Media/RotateTransform.cs
+++ b/src/Avalonia.Base/Media/RotateTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Rotates an <see cref="IVisual"/>.
+    /// Rotates an <see cref="Visual"/>.
     /// </summary>
     public class RotateTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/ScaleTransform.cs b/src/Avalonia.Base/Media/ScaleTransform.cs
index 259b23cbd2..d4c1a7f993 100644
--- a/src/Avalonia.Base/Media/ScaleTransform.cs
+++ b/src/Avalonia.Base/Media/ScaleTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Scale an <see cref="IVisual"/>.
+    /// Scale an <see cref="Visual"/>.
     /// </summary>
     public class ScaleTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/SkewTransform.cs b/src/Avalonia.Base/Media/SkewTransform.cs
index a96710e331..066f5371c3 100644
--- a/src/Avalonia.Base/Media/SkewTransform.cs
+++ b/src/Avalonia.Base/Media/SkewTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Skews an <see cref="IVisual"/>.
+    /// Skews an <see cref="Visual"/>.
     /// </summary>
     public class SkewTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/Transform.cs b/src/Avalonia.Base/Media/Transform.cs
index 023a8b9cdd..85393ab189 100644
--- a/src/Avalonia.Base/Media/Transform.cs
+++ b/src/Avalonia.Base/Media/Transform.cs
@@ -7,7 +7,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Represents a transform on an <see cref="IVisual"/>.
+    /// Represents a transform on an <see cref="Visual"/>.
     /// </summary>
     public abstract class Transform : Animatable, IMutableTransform
     {
diff --git a/src/Avalonia.Base/Media/TranslateTransform.cs b/src/Avalonia.Base/Media/TranslateTransform.cs
index d6d6809f3d..0f910f3600 100644
--- a/src/Avalonia.Base/Media/TranslateTransform.cs
+++ b/src/Avalonia.Base/Media/TranslateTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Translates (moves) an <see cref="IVisual"/>.
+    /// Translates (moves) an <see cref="Visual"/>.
     /// </summary>
     public class TranslateTransform : Transform
     {
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
index 4eec214f4f..a991f2f657 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
@@ -10,7 +10,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Rendering.SceneGraph
 {
     /// <summary>
-    /// A node in the low-level scene graph representing an <see cref="IVisual"/>.
+    /// A node in the low-level scene graph representing an <see cref="Visual"/>.
     /// </summary>
     internal class VisualNode : IVisualNode
     {
diff --git a/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
index e07534237a..487198a861 100644
--- a/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
+++ b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Styling.Activators
         /// </summary>
         /// <param name="sink">The listener.</param>
         /// <remarks>
-        /// This method should not call <see cref="IStyleActivatorSink.OnNext(bool, int)"/>.
+        /// This method should not call <see cref="IStyleActivatorSink.OnNext(bool)"/>.
         /// </remarks>
         void Subscribe(IStyleActivatorSink sink);