diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.Properties.cs
new file mode 100644
index 0000000000..e8fee4789b
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/CalendarDatePicker.Properties.cs
@@ -0,0 +1,306 @@
+using System;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Layout;
+
+namespace Avalonia.Controls
+{
+    /// <inheritdoc/>
+    public partial class CalendarDatePicker
+    {
+        /// <summary>
+        /// Defines the <see cref="DisplayDate"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime> DisplayDateProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime>(
+                nameof(DisplayDate),
+                o => o.DisplayDate,
+                (o, v) => o.DisplayDate = v);
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDateStart"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateStartProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(DisplayDateStart),
+                o => o.DisplayDateStart,
+                (o, v) => o.DisplayDateStart = v);
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDateEnd"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateEndProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(DisplayDateEnd),
+                o => o.DisplayDateEnd,
+                (o, v) => o.DisplayDateEnd = v);
+
+        /// <summary>
+        /// Defines the <see cref="FirstDayOfWeek"/> property.
+        /// </summary>
+        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
+
+        /// <summary>
+        /// Defines the <see cref="IsDropDownOpen"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, bool> IsDropDownOpenProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, bool>(
+                nameof(IsDropDownOpen),
+                o => o.IsDropDownOpen,
+                (o, v) => o.IsDropDownOpen = v);
+
+        /// <summary>
+        /// Defines the <see cref="IsTodayHighlighted"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, bool>(nameof(IsTodayHighlighted));
+
+        /// <summary>
+        /// Defines the <see cref="SelectedDate"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> SelectedDateProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(SelectedDate),
+                o => o.SelectedDate,
+                (o, v) => o.SelectedDate = v,
+                enableDataValidation: true, 
+                defaultBindingMode:BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="SelectedDateFormat"/> property.
+        /// </summary>
+        public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
+                nameof(SelectedDateFormat),
+                defaultValue: CalendarDatePickerFormat.Short,
+                validate: IsValidSelectedDateFormat);
+
+        /// <summary>
+        /// Defines the <see cref="CustomDateFormatString"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string> CustomDateFormatStringProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, string>(
+                nameof(CustomDateFormatString),
+                defaultValue: "d",
+                validate: IsValidDateFormatString);
+
+        /// <summary>
+        /// Defines the <see cref="Text"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, string?> TextProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, string?>(
+                nameof(Text),
+                o => o.Text,
+                (o, v) => o.Text = v);
+
+        /// <summary>
+        /// Defines the <see cref="Watermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string?> WatermarkProperty =
+            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="UseFloatingWatermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
+            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
+            ContentControl.HorizontalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
+            ContentControl.VerticalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Gets a collection of dates that are marked as not selectable.
+        /// </summary>
+        /// <value>
+        /// A collection of dates that cannot be selected. The default value is
+        /// an empty collection.
+        /// </value>
+        public CalendarBlackoutDatesCollection? BlackoutDates { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the date to display.
+        /// </summary>
+        /// <value>
+        /// The date to display. The default 
+        /// <see cref="P:System.DateTime.Today" />.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateEnd" />.
+        /// </exception>
+        public DateTime DisplayDate
+        {
+            get => _displayDate;
+            set => SetAndRaise(DisplayDateProperty, ref _displayDate, value);
+        }
+        
+        /// <summary>
+        /// Gets or sets the first date to be displayed.
+        /// </summary>
+        /// <value>The first date to display.</value>
+        public DateTime? DisplayDateStart
+        {
+            get => _displayDateStart;
+            set => SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the last date to be displayed.
+        /// </summary>
+        /// <value>The last date to display.</value>
+        public DateTime? DisplayDateEnd
+        {
+            get => _displayDateEnd;
+            set => SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the day that is considered the beginning of the week.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
+        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
+        /// </value>
+        public DayOfWeek FirstDayOfWeek
+        {
+            get => GetValue(FirstDayOfWeekProperty);
+            set => SetValue(FirstDayOfWeekProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is open or closed.
+        /// </summary>
+        /// <value>
+        /// True if the <see cref="T:Avalonia.Controls.Calendar" /> is
+        /// open; otherwise, false. The default is false.
+        /// </value>
+        public bool IsDropDownOpen
+        {
+            get => _isDropDownOpen;
+            set => SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the current date will be
+        /// highlighted.
+        /// </summary>
+        /// <value>
+        /// True if the current date is highlighted; otherwise, false. The
+        /// default is true.
+        /// </value>
+        public bool IsTodayHighlighted
+        {
+            get => GetValue(IsTodayHighlightedProperty);
+            set => SetValue(IsTodayHighlightedProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected date.
+        /// </summary>
+        /// <value>
+        /// The date currently selected. The default is null.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateEnd" />,
+        /// or the specified date is in the
+        /// <see cref="P:Avalonia.Controls.DatePicker.BlackoutDates" />
+        /// collection.
+        /// </exception>
+        public DateTime? SelectedDate
+        {
+            get => _selectedDate;
+            set => SetAndRaise(SelectedDateProperty, ref _selectedDate, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the format that is used to display the selected date.
+        /// </summary>
+        /// <value>
+        /// The format that is used to display the selected date. The default is
+        /// <see cref="F:Avalonia.Controls.DatePickerFormat.Short" />.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// An specified format is not valid.
+        /// </exception>
+        public CalendarDatePickerFormat SelectedDateFormat
+        {
+            get => GetValue(SelectedDateFormatProperty);
+            set => SetValue(SelectedDateFormatProperty, value);
+        }
+
+        public string CustomDateFormatString
+        {
+            get => GetValue(CustomDateFormatStringProperty);
+            set => SetValue(CustomDateFormatStringProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed by the
+        /// <see cref="T:Avalonia.Controls.DatePicker" />.
+        /// </summary>
+        /// <value>
+        /// The text displayed by the
+        /// <see cref="T:Avalonia.Controls.DatePicker" />.
+        /// </value>
+        /// <exception cref="T:System.FormatException">
+        /// The text entered cannot be parsed to a valid date, and the exception
+        /// is not suppressed.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The text entered parses to a date that is not selectable.
+        /// </exception>
+        public string? Text
+        {
+            get => _text;
+            set => SetAndRaise(TextProperty, ref _text, value);
+        }
+
+        /// <inheritdoc cref="TextBox.Watermark"/>
+        public string? Watermark
+        {
+            get => GetValue(WatermarkProperty);
+            set => SetValue(WatermarkProperty, value);
+        }
+
+        /// <inheritdoc cref="TextBox.UseFloatingWatermark"/>
+        public bool UseFloatingWatermark
+        {
+            get => GetValue(UseFloatingWatermarkProperty);
+            set => SetValue(UseFloatingWatermarkProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of the content within the control.
+        /// </summary>
+        public HorizontalAlignment HorizontalContentAlignment
+        {
+            get => GetValue(HorizontalContentAlignmentProperty);
+            set => SetValue(HorizontalContentAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the vertical alignment of the content within the control.
+        /// </summary>
+        public VerticalAlignment VerticalContentAlignment
+        {
+            get => GetValue(VerticalContentAlignmentProperty);
+            set => SetValue(VerticalContentAlignmentProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
index 09330c2304..55ecd6b50c 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
@@ -121,7 +121,7 @@ namespace Avalonia.Controls
     [TemplatePart(ElementCalendar, typeof(Calendar))]
     [TemplatePart(ElementPopup,    typeof(Popup))]
     [TemplatePart(ElementTextBox,  typeof(TextBox))]
-    public class CalendarDatePicker : TemplatedControl
+    public partial class CalendarDatePicker : TemplatedControl
     {
         private const string ElementTextBox = "PART_TextBox";
         private const string ElementButton = "PART_Button";
@@ -151,301 +151,6 @@ namespace Avalonia.Controls
         private bool _isPopupClosing = false;
         private bool _ignoreButtonClick = false;
 
-        /// <summary>
-        /// Gets a collection of dates that are marked as not selectable.
-        /// </summary>
-        /// <value>
-        /// A collection of dates that cannot be selected. The default value is
-        /// an empty collection.
-        /// </value>
-        public CalendarBlackoutDatesCollection? BlackoutDates { get; private set; }
-
-        /// <summary>
-        /// Defines the <see cref="DisplayDate"/> property.
-        /// </summary>
-        public static readonly DirectProperty<CalendarDatePicker, DateTime> DisplayDateProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime>(
-                nameof(DisplayDate),
-                o => o.DisplayDate,
-                (o, v) => o.DisplayDate = v);
-
-        /// <summary>
-        /// Defines the <see cref="DisplayDateStart"/> property.
-        /// </summary>
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateStartProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(DisplayDateStart),
-                o => o.DisplayDateStart,
-                (o, v) => o.DisplayDateStart = v);
-
-        /// <summary>
-        /// Defines the <see cref="DisplayDateEnd"/> property.
-        /// </summary>
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateEndProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(DisplayDateEnd),
-                o => o.DisplayDateEnd,
-                (o, v) => o.DisplayDateEnd = v);
-
-        /// <summary>
-        /// Defines the <see cref="FirstDayOfWeek"/> property.
-        /// </summary>
-        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
-
-        /// <summary>
-        /// Defines the <see cref="IsDropDownOpen"/> property.
-        /// </summary>
-        public static readonly DirectProperty<CalendarDatePicker, bool> IsDropDownOpenProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, bool>(
-                nameof(IsDropDownOpen),
-                o => o.IsDropDownOpen,
-                (o, v) => o.IsDropDownOpen = v);
-
-        /// <summary>
-        /// Defines the <see cref="IsTodayHighlighted"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, bool>(nameof(IsTodayHighlighted));
-
-        /// <summary>
-        /// Defines the <see cref="SelectedDate"/> property.
-        /// </summary>
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> SelectedDateProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(SelectedDate),
-                o => o.SelectedDate,
-                (o, v) => o.SelectedDate = v,
-                enableDataValidation: true, 
-                defaultBindingMode:BindingMode.TwoWay);
-
-        /// <summary>
-        /// Defines the <see cref="SelectedDateFormat"/> property.
-        /// </summary>
-        public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
-                nameof(SelectedDateFormat),
-                defaultValue: CalendarDatePickerFormat.Short,
-                validate: IsValidSelectedDateFormat);
-
-        /// <summary>
-        /// Defines the <see cref="CustomDateFormatString"/> property.
-        /// </summary>
-        public static readonly StyledProperty<string> CustomDateFormatStringProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, string>(
-                nameof(CustomDateFormatString),
-                defaultValue: "d",
-                validate: IsValidDateFormatString);
-
-        /// <summary>
-        /// Defines the <see cref="Text"/> property.
-        /// </summary>
-        public static readonly DirectProperty<CalendarDatePicker, string?> TextProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, string?>(
-                nameof(Text),
-                o => o.Text,
-                (o, v) => o.Text = v);
-
-        /// <summary>
-        /// Defines the <see cref="Watermark"/> property.
-        /// </summary>
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Defines the <see cref="UseFloatingWatermark"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
-            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Defines the <see cref="HorizontalContentAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
-            ContentControl.HorizontalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Defines the <see cref="VerticalContentAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
-            ContentControl.VerticalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Gets or sets the date to display.
-        /// </summary>
-        /// <value>
-        /// The date to display. The default 
-        /// <see cref="P:System.DateTime.Today" />.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The specified date is not in the range defined by
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateStart" />
-        /// and
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateEnd" />.
-        /// </exception>
-        public DateTime DisplayDate
-        {
-            get => _displayDate;
-            set => SetAndRaise(DisplayDateProperty, ref _displayDate, value);
-        }
-        
-        /// <summary>
-        /// Gets or sets the first date to be displayed.
-        /// </summary>
-        /// <value>The first date to display.</value>
-        public DateTime? DisplayDateStart
-        {
-            get => _displayDateStart;
-            set => SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the last date to be displayed.
-        /// </summary>
-        /// <value>The last date to display.</value>
-        public DateTime? DisplayDateEnd
-        {
-            get => _displayDateEnd;
-            set => SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the day that is considered the beginning of the week.
-        /// </summary>
-        /// <value>
-        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
-        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
-        /// </value>
-        public DayOfWeek FirstDayOfWeek
-        {
-            get => GetValue(FirstDayOfWeekProperty);
-            set => SetValue(FirstDayOfWeekProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the drop-down
-        /// <see cref="T:Avalonia.Controls.Calendar" /> is open or closed.
-        /// </summary>
-        /// <value>
-        /// True if the <see cref="T:Avalonia.Controls.Calendar" /> is
-        /// open; otherwise, false. The default is false.
-        /// </value>
-        public bool IsDropDownOpen
-        {
-            get => _isDropDownOpen;
-            set => SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the current date will be
-        /// highlighted.
-        /// </summary>
-        /// <value>
-        /// True if the current date is highlighted; otherwise, false. The
-        /// default is true.
-        /// </value>
-        public bool IsTodayHighlighted
-        {
-            get => GetValue(IsTodayHighlightedProperty);
-            set => SetValue(IsTodayHighlightedProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the currently selected date.
-        /// </summary>
-        /// <value>
-        /// The date currently selected. The default is null.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The specified date is not in the range defined by
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateStart" />
-        /// and
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateEnd" />,
-        /// or the specified date is in the
-        /// <see cref="P:Avalonia.Controls.DatePicker.BlackoutDates" />
-        /// collection.
-        /// </exception>
-        public DateTime? SelectedDate
-        {
-            get => _selectedDate;
-            set => SetAndRaise(SelectedDateProperty, ref _selectedDate, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the format that is used to display the selected date.
-        /// </summary>
-        /// <value>
-        /// The format that is used to display the selected date. The default is
-        /// <see cref="F:Avalonia.Controls.DatePickerFormat.Short" />.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// An specified format is not valid.
-        /// </exception>
-        public CalendarDatePickerFormat SelectedDateFormat
-        {
-            get => GetValue(SelectedDateFormatProperty);
-            set => SetValue(SelectedDateFormatProperty, value);
-        }
-
-        public string CustomDateFormatString
-        {
-            get => GetValue(CustomDateFormatStringProperty);
-            set => SetValue(CustomDateFormatStringProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the text that is displayed by the
-        /// <see cref="T:Avalonia.Controls.DatePicker" />.
-        /// </summary>
-        /// <value>
-        /// The text displayed by the
-        /// <see cref="T:Avalonia.Controls.DatePicker" />.
-        /// </value>
-        /// <exception cref="T:System.FormatException">
-        /// The text entered cannot be parsed to a valid date, and the exception
-        /// is not suppressed.
-        /// </exception>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The text entered parses to a date that is not selectable.
-        /// </exception>
-        public string? Text
-        {
-            get => _text;
-            set => SetAndRaise(TextProperty, ref _text, value);
-        }
-
-        /// <inheritdoc cref="TextBox.Watermark"/>
-        public string? Watermark
-        {
-            get => GetValue(WatermarkProperty);
-            set => SetValue(WatermarkProperty, value);
-        }
-
-        /// <inheritdoc cref="TextBox.UseFloatingWatermark"/>
-        public bool UseFloatingWatermark
-        {
-            get => GetValue(UseFloatingWatermarkProperty);
-            set => SetValue(UseFloatingWatermarkProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the horizontal alignment of the content within the control.
-        /// </summary>
-        public HorizontalAlignment HorizontalContentAlignment
-        {
-            get => GetValue(HorizontalContentAlignmentProperty);
-            set => SetValue(HorizontalContentAlignmentProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the vertical alignment of the content within the control.
-        /// </summary>
-        public VerticalAlignment VerticalContentAlignment
-        {
-            get => GetValue(VerticalContentAlignmentProperty);
-            set => SetValue(VerticalContentAlignmentProperty, value);
-        }
-
         /// <summary>
         /// Occurs when the drop-down
         /// <see cref="T:Avalonia.Controls.Calendar" /> is closed.