In `Avalonia.Controls`, modernized `get`ter/`set`ter syntax (#13021)

Co-authored-by: Lehonti Ramos <lehonti@ramos>

src/Avalonia.Controls/Application.cs

@@ -83,8 +83,8 @@ namespace Avalonia
         /// </remarks>
         public object? DataContext
         {
-            get { return GetValue(DataContextProperty); }
+            get => GetValue(DataContextProperty);
-            set { SetValue(DataContextProperty, value); }
+            set => SetValue(DataContextProperty, value);
         }
 
         /// <inheritdoc cref="ThemeVariantScope.RequestedThemeVariant"/>
@@ -107,7 +107,7 @@ namespace Avalonia
         /// </value>
         public static Application? Current
         {
-            get { return AvaloniaLocator.Current.GetService<Application>(); }
+            get => AvaloniaLocator.Current.GetService<Application>();
         }
 
         /// <summary>

src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.cs

@@ -933,8 +933,8 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler<SelectionChangedEventArgs> SelectionChanged
         {
-            add { AddHandler(SelectionChangedEvent, value); }
+            add => AddHandler(SelectionChangedEvent, value);
-            remove { RemoveHandler(SelectionChangedEvent, value); }
+            remove => RemoveHandler(SelectionChangedEvent, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Automation/Peers/ProgressBarAutomationPeer.cs

@@ -35,28 +35,19 @@ namespace Avalonia.Controls.Automation.Peers
         ///returns True if the control is read-only</summary>
         bool IRangeValueProvider.IsReadOnly
         {
-            get
+            get => true;
-            {
-                return true;
-            }
         }
 
         ///<summary>Value of a Large Change</summary>
         double IRangeValueProvider.LargeChange
         {
-            get
+            get => double.NaN;
-            {
-                return double.NaN;
-            }
         }
 
         ///<summary>Value of a Small Change</summary>
         double IRangeValueProvider.SmallChange
         {
-            get
+            get => double.NaN;
-            {
-                return double.NaN;
-            }
         }
     }
 }

src/Avalonia.Controls/ButtonSpinner.cs

@@ -49,12 +49,12 @@ namespace Avalonia.Controls
         /// </summary>
         private Button? DecreaseButton
         {
-            get { return _decreaseButton; }
+            get => _decreaseButton;
             set
             {
                 if (_decreaseButton != null)
                 {
-                    _decreaseButton.Click  -= OnButtonClick;
+                    _decreaseButton.Click -= OnButtonClick;
                 }
                 _decreaseButton = value;
                 if (_decreaseButton != null)
@@ -70,10 +70,7 @@ namespace Avalonia.Controls
         /// </summary>
         private Button? IncreaseButton
         {
-            get
+            get => _increaseButton;
-            {
-                return _increaseButton;
-            }
             set
             {
                 if (_increaseButton != null)
@@ -101,8 +98,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AllowSpin
         {
-            get { return GetValue(AllowSpinProperty); }
+            get => GetValue(AllowSpinProperty);
-            set { SetValue(AllowSpinProperty, value); }
+            set => SetValue(AllowSpinProperty, value);
         }
 
         /// <summary>
@@ -110,8 +107,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool ShowButtonSpinner
         {
-            get { return GetValue(ShowButtonSpinnerProperty); }
+            get => GetValue(ShowButtonSpinnerProperty);
-            set { SetValue(ShowButtonSpinnerProperty, value); }
+            set => SetValue(ShowButtonSpinnerProperty, value);
         }
 
         /// <summary>
@@ -119,8 +116,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Location ButtonSpinnerLocation
         {
-            get { return GetValue(ButtonSpinnerLocationProperty); }
+            get => GetValue(ButtonSpinnerLocationProperty);
-            set { SetValue(ButtonSpinnerLocationProperty, value); }
+            set => SetValue(ButtonSpinnerLocationProperty, value);
         }
 
         /// <inheritdoc />

src/Avalonia.Controls/Calendar/Calendar.cs

@@ -269,8 +269,8 @@ namespace Avalonia.Controls
         /// </value>
         public DayOfWeek FirstDayOfWeek
         {
-            get { return GetValue(FirstDayOfWeekProperty); }
+            get => GetValue(FirstDayOfWeekProperty);
-            set { SetValue(FirstDayOfWeekProperty, value); }
+            set => SetValue(FirstDayOfWeekProperty, value);
         }
 
         /// <summary>
@@ -323,8 +323,8 @@ namespace Avalonia.Controls
         /// </value>
         public bool IsTodayHighlighted
         {
-            get { return GetValue(IsTodayHighlightedProperty); }
+            get => GetValue(IsTodayHighlightedProperty);
-            set { SetValue(IsTodayHighlightedProperty, value); }
+            set => SetValue(IsTodayHighlightedProperty, value);
         }
 
         /// <summary>
@@ -346,8 +346,8 @@ namespace Avalonia.Controls
 
         public IBrush? HeaderBackground
         {
-            get { return GetValue(HeaderBackgroundProperty); }
+            get => GetValue(HeaderBackgroundProperty);
-            set { SetValue(HeaderBackgroundProperty, value); }
+            set => SetValue(HeaderBackgroundProperty, value);
         }
 
         public static readonly StyledProperty<CalendarMode> DisplayModeProperty =
@@ -365,8 +365,8 @@ namespace Avalonia.Controls
         /// </value>
         public CalendarMode DisplayMode
         {
-            get { return GetValue(DisplayModeProperty); }
+            get => GetValue(DisplayModeProperty);
-            set { SetValue(DisplayModeProperty, value); }
+            set => SetValue(DisplayModeProperty, value);
         }
 
         /// <summary>
@@ -458,8 +458,8 @@ namespace Avalonia.Controls
         /// </remarks>
         public CalendarSelectionMode SelectionMode
         {
-            get { return GetValue(SelectionModeProperty); }
+            get => GetValue(SelectionModeProperty);
-            set { SetValue(SelectionModeProperty, value); }
+            set => SetValue(SelectionModeProperty, value);
         }
 
         private void OnSelectionModeChanged(AvaloniaPropertyChangedEventArgs e)
@@ -649,7 +649,7 @@ namespace Avalonia.Controls
         internal DateTime? LastSelectedDateInternal { get; set; }
         internal DateTime? LastSelectedDate
         {
-            get { return LastSelectedDateInternal; }
+            get => LastSelectedDateInternal;
             set
             {
                 LastSelectedDateInternal = value;
@@ -671,7 +671,7 @@ namespace Avalonia.Controls
 
         internal DateTime SelectedMonth
         {
-            get { return _selectedMonth; }
+            get => _selectedMonth;
             set
             {
                 int monthDifferenceStart = DateTimeHelper.CompareYearMonth(value, DisplayDateRangeStart);
@@ -697,7 +697,7 @@ namespace Avalonia.Controls
         }
         internal DateTime SelectedYear
         {
-            get { return _selectedYear; }
+            get => _selectedYear;
             set
             {
                 if (value.Year < DisplayDateRangeStart.Year)
@@ -888,7 +888,7 @@ namespace Avalonia.Controls
         }
         internal DateTime DisplayDateRangeStart
         {
-            get { return DisplayDateStart.GetValueOrDefault(DateTime.MinValue); }
+            get => DisplayDateStart.GetValueOrDefault(DateTime.MinValue);
         }
 
         public static readonly StyledProperty<DateTime?> DisplayDateEndProperty =
@@ -973,7 +973,7 @@ namespace Avalonia.Controls
         }
         internal DateTime DisplayDateRangeEnd
         {
-            get { return DisplayDateEnd.GetValueOrDefault(DateTime.MaxValue); }
+            get => DisplayDateEnd.GetValueOrDefault(DateTime.MaxValue);
         }
 
         internal DateTime? HoverStart { get; set; }
@@ -981,7 +981,7 @@ namespace Avalonia.Controls
         internal DateTime? HoverEndInternal { get; set; }
         internal DateTime? HoverEnd
         {
-            get { return HoverEndInternal; }
+            get => HoverEndInternal;
             set
             {
                 HoverEndInternal = value;

src/Avalonia.Controls/Calendar/CalendarButton.cs

@@ -52,7 +52,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsCalendarButtonFocused
         {
-            get { return _isCalendarButtonFocused; }
+            get => _isCalendarButtonFocused;
             set
             {
                 if (_isCalendarButtonFocused != value)
@@ -68,7 +68,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsInactive
         {
-            get { return _isInactive; }
+            get => _isInactive;
             set
             {
                 if (_isInactive != value)
@@ -84,7 +84,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsSelected
         {
-            get { return _isSelected; }
+            get => _isSelected;
             set
             {
                 if (_isSelected != value)

src/Avalonia.Controls/Calendar/CalendarDayButton.cs

@@ -49,7 +49,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsCurrent
         {
-            get { return _isCurrent; }
+            get => _isCurrent;
             set
             {
                 if (_isCurrent != value)
@@ -93,7 +93,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsBlackout
         {
-            get { return _isBlackout; }
+            get => _isBlackout;
             set
             {
                 if (_isBlackout != value)
@@ -110,7 +110,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsToday
         {
-            get { return _isToday; }
+            get => _isToday;
             set
             {
                 if (_isToday != value)
@@ -125,7 +125,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsInactive
         {
-            get { return _isInactive; }
+            get => _isInactive;
             set
             {
                 if (_isInactive != value)
@@ -141,7 +141,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal bool IsSelected
         {
-            get { return _isSelected; }
+            get => _isSelected;
             set
             {
                 if (_isSelected != value)

src/Avalonia.Controls/Calendar/CalendarItem.cs

@@ -56,8 +56,8 @@ namespace Avalonia.Controls.Primitives
 
         public IBrush? HeaderBackground
         {
-            get { return GetValue(HeaderBackgroundProperty); }
+            get => GetValue(HeaderBackgroundProperty);
-            set { SetValue(HeaderBackgroundProperty, value); }
+            set => SetValue(HeaderBackgroundProperty, value);
         }
 
         public static readonly StyledProperty<ITemplate<Control>?> DayTitleTemplateProperty =
@@ -77,7 +77,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal Button? HeaderButton
         {
-            get { return _headerButton; }
+            get => _headerButton;
             private set
             {
                 if (_headerButton != null)
@@ -98,7 +98,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal Button? NextButton
         {
-            get { return _nextButton; }
+            get => _nextButton;
             private set
             {
                 if (_nextButton != null)
@@ -129,7 +129,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         internal Button? PreviousButton
         {
-            get { return _previousButton; }
+            get => _previousButton;
             private set
             {
                 if (_previousButton != null)

src/Avalonia.Controls/Carousel.cs

@@ -38,8 +38,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IPageTransition? PageTransition
         {
-            get { return GetValue(PageTransitionProperty); }
+            get => GetValue(PageTransitionProperty);
-            set { SetValue(PageTransitionProperty, value); }
+            set => SetValue(PageTransitionProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/ColumnDefinition.cs

@@ -69,14 +69,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double MaxWidth
         {
-            get
+            get => GetValue(MaxWidthProperty);
-            {
+            set => SetValue(MaxWidthProperty, value);
-                return GetValue(MaxWidthProperty);
-            }
-            set
-            {
-                SetValue(MaxWidthProperty, value);
-            }
         }
 
         /// <summary>
@@ -84,14 +78,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double MinWidth
         {
-            get
+            get => GetValue(MinWidthProperty);
-            {
+            set => SetValue(MinWidthProperty, value);
-                return GetValue(MinWidthProperty);
-            }
-            set
-            {
-                SetValue(MinWidthProperty, value);
-            }
         }
 
         /// <summary>
@@ -99,14 +87,8 @@ namespace Avalonia.Controls
         /// </summary>
         public GridLength Width
         {
-            get
+            get => GetValue(WidthProperty);
-            {
+            set => SetValue(WidthProperty, value);
-                return GetValue(WidthProperty);
-            }
-            set
-            {
-                SetValue(WidthProperty, value);
-            }
         }
 
         internal override GridLength UserSizeValueCache => this.Width;

src/Avalonia.Controls/ContentControl.cs

@@ -47,8 +47,8 @@ namespace Avalonia.Controls
         [DependsOn(nameof(ContentTemplate))]
         public object? Content
         {
-            get { return GetValue(ContentProperty); }
+            get => GetValue(ContentProperty);
-            set { SetValue(ContentProperty, value); }
+            set => SetValue(ContentProperty, value);
         }
 
         /// <summary>
@@ -56,8 +56,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IDataTemplate? ContentTemplate
         {
-            get { return GetValue(ContentTemplateProperty); }
+            get => GetValue(ContentTemplateProperty);
-            set { SetValue(ContentTemplateProperty, value); }
+            set => SetValue(ContentTemplateProperty, value);
         }
 
         /// <summary>
@@ -74,8 +74,8 @@ namespace Avalonia.Controls
         /// </summary>
         public HorizontalAlignment HorizontalContentAlignment
         {
-            get { return GetValue(HorizontalContentAlignmentProperty); }
+            get => GetValue(HorizontalContentAlignmentProperty);
-            set { SetValue(HorizontalContentAlignmentProperty, value); }
+            set => SetValue(HorizontalContentAlignmentProperty, value);
         }
 
         /// <summary>
@@ -83,8 +83,8 @@ namespace Avalonia.Controls
         /// </summary>
         public VerticalAlignment VerticalContentAlignment
         {
-            get { return GetValue(VerticalContentAlignmentProperty); }
+            get => GetValue(VerticalContentAlignmentProperty);
-            set { SetValue(VerticalContentAlignmentProperty, value); }
+            set => SetValue(VerticalContentAlignmentProperty, value);
         }
 
         /// <inheritdoc/>

src/Avalonia.Controls/DataValidationErrors.cs

@@ -44,8 +44,8 @@ namespace Avalonia.Controls
 
         public Control? Owner
         {
-            get { return _owner; }
+            get => _owner;
-            set { SetAndRaise(OwnerProperty, ref _owner, value); }
+            set => SetAndRaise(OwnerProperty, ref _owner, value);
         }
 
         /// <summary>
@@ -68,8 +68,8 @@ namespace Avalonia.Controls
 
         public IDataTemplate ErrorTemplate
         {
-            get { return GetValue(ErrorTemplateProperty); }
+            get => GetValue(ErrorTemplateProperty);
-            set { SetValue(ErrorTemplateProperty, value); }
+            set => SetValue(ErrorTemplateProperty, value);
         }
 
         private static void ErrorsChanged(AvaloniaPropertyChangedEventArgs e)

src/Avalonia.Controls/Decorator.cs

@@ -35,8 +35,8 @@ namespace Avalonia.Controls
         [Content]
         public Control? Child
         {
-            get { return GetValue(ChildProperty); }
+            get => GetValue(ChildProperty);
-            set { SetValue(ChildProperty, value); }
+            set => SetValue(ChildProperty, value);
         }
 
         /// <summary>
@@ -44,8 +44,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Thickness Padding
         {
-            get { return GetValue(PaddingProperty); }
+            get => GetValue(PaddingProperty);
-            set { SetValue(PaddingProperty, value); }
+            set => SetValue(PaddingProperty, value);
         }
 
         /// <inheritdoc/>

src/Avalonia.Controls/DefinitionBase.cs

@@ -23,8 +23,8 @@ namespace Avalonia.Controls
         /// </summary>
         public string? SharedSizeGroup
         {
-            get { return GetValue(SharedSizeGroupProperty); }
+            get => GetValue(SharedSizeGroupProperty);
-            set { SetValue(SharedSizeGroupProperty, value); }
+            set => SetValue(SharedSizeGroupProperty, value);
         }
 
         /// <summary>
@@ -146,7 +146,7 @@ namespace Avalonia.Controls
         /// </summary>
         internal bool IsShared
         {
-            get { return (_sharedState != null); }
+            get => (_sharedState != null);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ namespace Avalonia.Controls
         /// </summary>
         internal GridLength UserSize
         {
-            get { return (_sharedState != null ? _sharedState.UserSize : UserSizeValueCache); }
+            get => (_sharedState != null ? _sharedState.UserSize : UserSizeValueCache);
         }
 
         /// <summary>
@@ -162,7 +162,7 @@ namespace Avalonia.Controls
         /// </summary>
         internal double UserMinSize
         {
-            get { return (UserMinSizeValueCache); }
+            get => (UserMinSizeValueCache);
         }
 
         /// <summary>
@@ -170,7 +170,7 @@ namespace Avalonia.Controls
         /// </summary>
         internal double UserMaxSize
         {
-            get { return (UserMaxSizeValueCache); }
+            get => (UserMaxSizeValueCache);
         }
 
         /// <summary>
@@ -178,10 +178,7 @@ namespace Avalonia.Controls
         /// </summary>
         internal int Index
         {
-            get
+            get => (_parentIndex);
-            {
-                return (_parentIndex);
-            }
             set
             {
                 Debug.Assert(value >= -1);
@@ -194,8 +191,8 @@ namespace Avalonia.Controls
         /// </summary>
         internal Grid.LayoutTimeSizeType SizeType
         {
-            get { return (_sizeType); }
+            get => (_sizeType);
-            set { _sizeType = value; }
+            set => _sizeType = value;
         }
 
         /// <summary>
@@ -203,8 +200,8 @@ namespace Avalonia.Controls
         /// </summary>
         internal double MeasureSize
         {
-            get { return (_measureSize); }
+            get => (_measureSize);
-            set { _measureSize = value; }
+            set => _measureSize = value;
         }
 
         /// <summary>
@@ -232,8 +229,8 @@ namespace Avalonia.Controls
         /// </summary>
         internal double SizeCache
         {
-            get { return (_sizeCache); }
+            get => (_sizeCache);
-            set { _sizeCache = value; }
+            set => _sizeCache = value;
         }
 
         /// <summary>
@@ -277,8 +274,8 @@ namespace Avalonia.Controls
         /// </summary>
         internal double FinalOffset
         {
-            get { return _offset; }
+            get => _offset;
-            set { _offset = value; }
+            set => _offset = value;
         }
 
         /// <summary>
@@ -417,8 +414,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool UseSharedMinimum
         {
-            get { return (CheckFlagsAnd(Flags.UseSharedMinimum)); }
+            get => (CheckFlagsAnd(Flags.UseSharedMinimum));
-            set { SetFlags(value, Flags.UseSharedMinimum); }
+            set => SetFlags(value, Flags.UseSharedMinimum);
         }
 
         /// <summary>
@@ -426,8 +423,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool LayoutWasUpdated
         {
-            get { return (CheckFlagsAnd(Flags.LayoutWasUpdated)); }
+            get => (CheckFlagsAnd(Flags.LayoutWasUpdated));
-            set { SetFlags(value, Flags.LayoutWasUpdated); }
+            set => SetFlags(value, Flags.LayoutWasUpdated);
         }
 
         private Flags _flags;                           //  flags reflecting various aspects of internal state

src/Avalonia.Controls/DockPanel.cs

@@ -71,8 +71,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool LastChildFill
         {
-            get { return GetValue(LastChildFillProperty); }
+            get => GetValue(LastChildFillProperty);
-            set { SetValue(LastChildFillProperty, value); }
+            set => SetValue(LastChildFillProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Documents/Inline.cs

@@ -32,8 +32,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public TextDecorationCollection? TextDecorations
         {
-            get { return GetValue(TextDecorationsProperty); }
+            get => GetValue(TextDecorationsProperty);
-            set { SetValue(TextDecorationsProperty, value); }
+            set => SetValue(TextDecorationsProperty, value);
         }
 
         /// <summary>
@@ -42,10 +42,10 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public BaselineAlignment BaselineAlignment
         {
-            get { return GetValue(BaselineAlignmentProperty); }
+            get => GetValue(BaselineAlignmentProperty);
-            set { SetValue(BaselineAlignmentProperty, value); }
+            set => SetValue(BaselineAlignmentProperty, value);
         }
-        
+
         /// <summary>
         /// Gets the value of the attached <see cref="TextDecorationsProperty"/> on a control.
         /// </summary>

src/Avalonia.Controls/Documents/Run.cs

@@ -46,8 +46,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         [Content]
         public string? Text {
-            get { return GetValue (TextProperty); }
+            get => GetValue(TextProperty);
-            set { SetValue (TextProperty, value); }
+            set => SetValue(TextProperty, value);
         }
 
         internal override void BuildTextRun(IList<TextRun> textRuns)

src/Avalonia.Controls/Documents/TextElement.cs

@@ -74,8 +74,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public IBrush? Background
         {
-            get { return GetValue(BackgroundProperty); }
+            get => GetValue(BackgroundProperty);
-            set { SetValue(BackgroundProperty, value); }
+            set => SetValue(BackgroundProperty, value);
         }
 
         /// <summary>
@@ -83,8 +83,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public FontFamily FontFamily
         {
-            get { return GetValue(FontFamilyProperty); }
+            get => GetValue(FontFamilyProperty);
-            set { SetValue(FontFamilyProperty, value); }
+            set => SetValue(FontFamilyProperty, value);
         }
 
         /// <summary>
@@ -92,8 +92,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public double FontSize
         {
-            get { return GetValue(FontSizeProperty); }
+            get => GetValue(FontSizeProperty);
-            set { SetValue(FontSizeProperty, value); }
+            set => SetValue(FontSizeProperty, value);
         }
 
         /// <summary>
@@ -101,8 +101,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public FontStyle FontStyle
         {
-            get { return GetValue(FontStyleProperty); }
+            get => GetValue(FontStyleProperty);
-            set { SetValue(FontStyleProperty, value); }
+            set => SetValue(FontStyleProperty, value);
         }
 
         /// <summary>
@@ -110,8 +110,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public FontWeight FontWeight
         {
-            get { return GetValue(FontWeightProperty); }
+            get => GetValue(FontWeightProperty);
-            set { SetValue(FontWeightProperty, value); }
+            set => SetValue(FontWeightProperty, value);
         }
 
         /// <summary>
@@ -119,8 +119,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public FontStretch FontStretch
         {
-            get { return GetValue(FontStretchProperty); }
+            get => GetValue(FontStretchProperty);
-            set { SetValue(FontStretchProperty, value); }
+            set => SetValue(FontStretchProperty, value);
         }
 
         /// <summary>
@@ -128,8 +128,8 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         public IBrush? Foreground
         {
-            get { return GetValue(ForegroundProperty); }
+            get => GetValue(ForegroundProperty);
-            set { SetValue(ForegroundProperty, value); }
+            set => SetValue(ForegroundProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs

@@ -31,7 +31,7 @@ namespace Avalonia.Controls.Embedding.Offscreen
 
         public Size ClientSize
         {
-            get { return _clientSize; }
+            get => _clientSize;
             set
             {
                 _clientSize = value;
@@ -43,14 +43,14 @@ namespace Avalonia.Controls.Embedding.Offscreen
 
         public double RenderScaling
         {
-            get { return _scaling; }
+            get => _scaling;
             set
             {
                 _scaling = value;
                 ScalingChanged?.Invoke(value);
             }
         }
-        
+
         public Action<RawInputEventArgs>? Input { get; set; }
         public Action<Rect>? Paint { get; set; }
         public Action<Size, WindowResizeReason>? Resized { get; set; }

src/Avalonia.Controls/ExperimentalAcrylicBorder.cs

@@ -35,8 +35,8 @@ namespace Avalonia.Controls
         /// </summary>
         public CornerRadius CornerRadius
         {
-            get { return GetValue(CornerRadiusProperty); }
+            get => GetValue(CornerRadiusProperty);
-            set { SetValue(CornerRadiusProperty, value); }
+            set => SetValue(CornerRadiusProperty, value);
         }
 
         public ExperimentalAcrylicMaterial Material

src/Avalonia.Controls/Grid.cs

@@ -157,8 +157,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool ShowGridLines
         {
-            get { return GetValue(ShowGridLinesProperty); }
+            get => GetValue(ShowGridLinesProperty);
-            set { SetValue(ShowGridLinesProperty, value); }
+            set => SetValue(ShowGridLinesProperty, value);
         }
 
         /// <summary>
@@ -630,8 +630,8 @@ namespace Avalonia.Controls
         /// </summary>
         internal bool MeasureOverrideInProgress
         {
-            get { return CheckFlags(Flags.MeasureOverrideInProgress); }
+            get => CheckFlags(Flags.MeasureOverrideInProgress);
-            set { SetFlags(value, Flags.MeasureOverrideInProgress); }
+            set => SetFlags(value, Flags.MeasureOverrideInProgress);
         }
 
         /// <summary>
@@ -639,8 +639,8 @@ namespace Avalonia.Controls
         /// </summary>
         internal bool ArrangeOverrideInProgress
         {
-            get { return CheckFlags(Flags.ArrangeOverrideInProgress); }
+            get => CheckFlags(Flags.ArrangeOverrideInProgress);
-            set { SetFlags(value, Flags.ArrangeOverrideInProgress); }
+            set => SetFlags(value, Flags.ArrangeOverrideInProgress);
         }
 
         /// <summary>
@@ -2415,7 +2415,7 @@ namespace Avalonia.Controls
         /// </summary>
         private IReadOnlyList<DefinitionBase> DefinitionsU
         {
-            get { return _extData!.DefinitionsU!; }
+            get => _extData!.DefinitionsU!;
         }
 
         /// <summary>
@@ -2423,7 +2423,7 @@ namespace Avalonia.Controls
         /// </summary>
         private IReadOnlyList<DefinitionBase> DefinitionsV
         {
-            get { return _extData!.DefinitionsV!; }
+            get => _extData!.DefinitionsV!;
         }
 
         /// <summary>
@@ -2506,7 +2506,7 @@ namespace Avalonia.Controls
         /// </summary>
         private CellCache[] PrivateCells
         {
-            get { return _extData!.CellCachesCollection!; }
+            get => _extData!.CellCachesCollection!;
         }
 
         /// <summary>
@@ -2514,8 +2514,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool CellsStructureDirty
         {
-            get { return !CheckFlags(Flags.ValidCellsStructure); }
+            get => !CheckFlags(Flags.ValidCellsStructure);
-            set { SetFlags(!value, Flags.ValidCellsStructure); }
+            set => SetFlags(!value, Flags.ValidCellsStructure);
         }
 
         /// <summary>
@@ -2523,8 +2523,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool ListenToNotifications
         {
-            get { return CheckFlags(Flags.ListenToNotifications); }
+            get => CheckFlags(Flags.ListenToNotifications);
-            set { SetFlags(value, Flags.ListenToNotifications); }
+            set => SetFlags(value, Flags.ListenToNotifications);
         }
 
         /// <summary>
@@ -2532,8 +2532,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool SizeToContentU
         {
-            get { return CheckFlags(Flags.SizeToContentU); }
+            get => CheckFlags(Flags.SizeToContentU);
-            set { SetFlags(value, Flags.SizeToContentU); }
+            set => SetFlags(value, Flags.SizeToContentU);
         }
 
         /// <summary>
@@ -2541,8 +2541,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool SizeToContentV
         {
-            get { return CheckFlags(Flags.SizeToContentV); }
+            get => CheckFlags(Flags.SizeToContentV);
-            set { SetFlags(value, Flags.SizeToContentV); }
+            set => SetFlags(value, Flags.SizeToContentV);
         }
 
         /// <summary>
@@ -2550,8 +2550,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool HasStarCellsU
         {
-            get { return CheckFlags(Flags.HasStarCellsU); }
+            get => CheckFlags(Flags.HasStarCellsU);
-            set { SetFlags(value, Flags.HasStarCellsU); }
+            set => SetFlags(value, Flags.HasStarCellsU);
         }
 
         /// <summary>
@@ -2559,8 +2559,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool HasStarCellsV
         {
-            get { return CheckFlags(Flags.HasStarCellsV); }
+            get => CheckFlags(Flags.HasStarCellsV);
-            set { SetFlags(value, Flags.HasStarCellsV); }
+            set => SetFlags(value, Flags.HasStarCellsV);
         }
 
         /// <summary>
@@ -2568,8 +2568,8 @@ namespace Avalonia.Controls
         /// </summary>
         private bool HasGroup3CellsInAutoRows
         {
-            get { return CheckFlags(Flags.HasGroup3CellsInAutoRows); }
+            get => CheckFlags(Flags.HasGroup3CellsInAutoRows);
-            set { SetFlags(value, Flags.HasGroup3CellsInAutoRows); }
+            set => SetFlags(value, Flags.HasGroup3CellsInAutoRows);
         }
 
         /// <summary>
@@ -2826,18 +2826,18 @@ namespace Avalonia.Controls
             /// <summary>
             /// Returns start index of the span.
             /// </summary>
-            internal int Start { get { return (_start); } }
+            internal int Start { get => (_start); }
 
             /// <summary>
             /// Returns span count.
             /// </summary>
-            internal int Count { get { return (_count); } }
+            internal int Count { get => (_count); }
 
             /// <summary>
             /// Returns <c>true</c> if this is a column span.
             /// <c>false</c> if this is a row span.
             /// </summary>
-            internal bool U { get { return (_u); } }
+            internal bool U { get => (_u); }
 
             private int _start;
             private int _count;

src/Avalonia.Controls/Image.cs

@@ -45,8 +45,8 @@ namespace Avalonia.Controls
         [Content]
         public IImage? Source
         {
-            get { return GetValue(SourceProperty); }
+            get => GetValue(SourceProperty);
-            set { SetValue(SourceProperty, value); }
+            set => SetValue(SourceProperty, value);
         }
 
         /// <summary>
@@ -54,8 +54,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Stretch Stretch
         {
-            get { return GetValue(StretchProperty); }
+            get => GetValue(StretchProperty);
-            set { SetValue(StretchProperty, value); }
+            set => SetValue(StretchProperty, value);
         }
 
         /// <summary>
@@ -63,8 +63,8 @@ namespace Avalonia.Controls
         /// </summary>
         public StretchDirection StretchDirection
         {
-            get { return GetValue(StretchDirectionProperty); }
+            get => GetValue(StretchDirectionProperty);
-            set { SetValue(StretchDirectionProperty, value); }
+            set => SetValue(StretchDirectionProperty, value);
         }
 
         /// <inheritdoc />

src/Avalonia.Controls/LayoutTransformControl.cs

@@ -39,8 +39,8 @@ namespace Avalonia.Controls
         /// </summary>
         public ITransform? LayoutTransform
         {
-            get { return GetValue(LayoutTransformProperty); }
+            get => GetValue(LayoutTransformProperty);
-            set { SetValue(LayoutTransformProperty, value); }
+            set => SetValue(LayoutTransformProperty, value);
         }
 
         /// <summary>
@@ -48,8 +48,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool UseRenderTransform
         {
-            get { return GetValue(UseRenderTransformProperty); }
+            get => GetValue(UseRenderTransformProperty);
-            set { SetValue(UseRenderTransformProperty, value); }
+            set => SetValue(UseRenderTransformProperty, value);
         }
 
         public Control? TransformRoot => Child;

src/Avalonia.Controls/ListBox.cs

@@ -73,8 +73,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IScrollable? Scroll
         {
-            get { return _scroll; }
+            get => _scroll;
-            private set { SetAndRaise(ScrollProperty, ref _scroll, value); }
+            private set => SetAndRaise(ScrollProperty, ref _scroll, value);
         }
 
         /// <inheritdoc/>
@@ -102,8 +102,8 @@ namespace Avalonia.Controls
             Justification = "This property is owned by SelectingItemsControl, but protected there. ListBox changes its visibility.")]
         public new SelectionMode SelectionMode
         {
-            get { return base.SelectionMode; }
+            get => base.SelectionMode;
-            set { base.SelectionMode = value; }
+            set => base.SelectionMode = value;
         }
 
         /// <summary>

src/Avalonia.Controls/ListBoxItem.cs

@@ -37,8 +37,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsSelected
         {
-            get { return GetValue(IsSelectedProperty); }
+            get => GetValue(IsSelectedProperty);
-            set { SetValue(IsSelectedProperty, value); }
+            set => SetValue(IsSelectedProperty, value);
         }
 
         protected override AutomationPeer OnCreateAutomationPeer()

src/Avalonia.Controls/MenuBase.cs

@@ -87,11 +87,8 @@ namespace Avalonia.Controls
                     (IMenuItem?)ContainerFromIndex(index) :
                     null;
             }
-            set
+            set => SelectedIndex = value is Control c ?
-            {
-                SelectedIndex = value is Control c ?
                     IndexFromContainer(c) : -1;
-            }
         }
 
         /// <inheritdoc/>

src/Avalonia.Controls/MenuItem.cs

@@ -164,8 +164,8 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler<RoutedEventArgs>? Click
         {
-            add { AddHandler(ClickEvent, value); }
+            add => AddHandler(ClickEvent, value);
-            remove { RemoveHandler(ClickEvent, value); }
+            remove => RemoveHandler(ClickEvent, value);
         }
 
         /// <summary>
@@ -176,8 +176,8 @@ namespace Avalonia.Controls
         /// </remarks>
         public event EventHandler<RoutedEventArgs>? PointerEnteredItem
         {
-            add { AddHandler(PointerEnteredItemEvent, value); }
+            add => AddHandler(PointerEnteredItemEvent, value);
-            remove { RemoveHandler(PointerEnteredItemEvent, value); }
+            remove => RemoveHandler(PointerEnteredItemEvent, value);
         }
 
         /// <summary>
@@ -188,8 +188,8 @@ namespace Avalonia.Controls
         /// </remarks>
         public event EventHandler<RoutedEventArgs>? PointerExitedItem
         {
-            add { AddHandler(PointerExitedItemEvent, value); }
+            add => AddHandler(PointerExitedItemEvent, value);
-            remove { RemoveHandler(PointerExitedItemEvent, value); }
+            remove => RemoveHandler(PointerExitedItemEvent, value);
         }
 
         /// <summary>
@@ -197,8 +197,8 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler<RoutedEventArgs>? SubmenuOpened
         {
-            add { AddHandler(SubmenuOpenedEvent, value); }
+            add => AddHandler(SubmenuOpenedEvent, value);
-            remove { RemoveHandler(SubmenuOpenedEvent, value); }
+            remove => RemoveHandler(SubmenuOpenedEvent, value);
         }
 
         /// <summary>
@@ -215,8 +215,8 @@ namespace Avalonia.Controls
         /// </summary>
         public KeyGesture? HotKey
         {
-            get { return GetValue(HotKeyProperty); }
+            get => GetValue(HotKeyProperty);
-            set { SetValue(HotKeyProperty, value); }
+            set => SetValue(HotKeyProperty, value);
         }
 
         /// <summary>
@@ -225,8 +225,8 @@ namespace Avalonia.Controls
         /// </summary>
         public object? CommandParameter
         {
-            get { return GetValue(CommandParameterProperty); }
+            get => GetValue(CommandParameterProperty);
-            set { SetValue(CommandParameterProperty, value); }
+            set => SetValue(CommandParameterProperty, value);
         }
 
         /// <summary>
@@ -234,8 +234,8 @@ namespace Avalonia.Controls
         /// </summary>
         public object? Icon
         {
-            get { return GetValue(IconProperty); }
+            get => GetValue(IconProperty);
-            set { SetValue(IconProperty, value); }
+            set => SetValue(IconProperty, value);
         }
 
         /// <summary>
@@ -247,8 +247,8 @@ namespace Avalonia.Controls
         /// </remarks>
         public KeyGesture? InputGesture
         {
-            get { return GetValue(InputGestureProperty); }
+            get => GetValue(InputGestureProperty);
-            set { SetValue(InputGestureProperty, value); }
+            set => SetValue(InputGestureProperty, value);
         }
 
         /// <summary>
@@ -256,8 +256,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsSelected
         {
-            get { return GetValue(IsSelectedProperty); }
+            get => GetValue(IsSelectedProperty);
-            set { SetValue(IsSelectedProperty, value); }
+            set => SetValue(IsSelectedProperty, value);
         }
 
         /// <summary>
@@ -266,8 +266,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsSubMenuOpen
         {
-            get { return GetValue(IsSubMenuOpenProperty); }
+            get => GetValue(IsSubMenuOpenProperty);
-            set { SetValue(IsSubMenuOpenProperty, value); }
+            set => SetValue(IsSubMenuOpenProperty, value);
         }
 
         /// <summary>
@@ -276,8 +276,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool StaysOpenOnClick
         {
-            get { return GetValue(StaysOpenOnClickProperty); }
+            get => GetValue(StaysOpenOnClickProperty);
-            set { SetValue(StaysOpenOnClickProperty, value); }
+            set => SetValue(StaysOpenOnClickProperty, value);
         }
 
         /// <summary>
@@ -311,10 +311,7 @@ namespace Avalonia.Controls
                     (IMenuItem?)ContainerFromIndex(index) :
                     null;
             }
-            set
+            set => SelectedIndex = value is Control c ? IndexFromContainer(c) : -1;
-            {
-                SelectedIndex = value is Control c ? IndexFromContainer(c) : -1;
-            }
         }
 
         /// <inheritdoc/>

src/Avalonia.Controls/NativeMenuItem.cs

@@ -136,8 +136,8 @@ namespace Avalonia.Controls
         /// </summary>
         public object? CommandParameter
         {
-            get { return GetValue(CommandParameterProperty); }
+            get => GetValue(CommandParameterProperty);
-            set { SetValue(CommandParameterProperty, value); }
+            set => SetValue(CommandParameterProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Notifications/NotificationCard.cs

@@ -33,8 +33,8 @@ namespace Avalonia.Controls.Notifications
         /// </summary>
         public bool IsClosing
         {
-            get { return _isClosing; }
+            get => _isClosing;
-            private set { SetAndRaise(IsClosingProperty, ref _isClosing, value); }
+            private set => SetAndRaise(IsClosingProperty, ref _isClosing, value);
         }
 
         /// <summary>
@@ -63,8 +63,8 @@ namespace Avalonia.Controls.Notifications
         /// </summary>
         public NotificationType NotificationType
         {
-            get { return GetValue(NotificationTypeProperty); }
+            get => GetValue(NotificationTypeProperty);
-            set { SetValue(NotificationTypeProperty, value); }
+            set => SetValue(NotificationTypeProperty, value);
         }
 
         /// <summary>
@@ -85,8 +85,8 @@ namespace Avalonia.Controls.Notifications
         /// </summary>
         public event EventHandler<RoutedEventArgs>? NotificationClosed
         {
-            add { AddHandler(NotificationClosedEvent, value); }
+            add => AddHandler(NotificationClosedEvent, value);
-            remove { RemoveHandler(NotificationClosedEvent, value); }
+            remove => RemoveHandler(NotificationClosedEvent, value);
         }
 
         public static bool GetCloseOnClick(Button obj)

src/Avalonia.Controls/Notifications/WindowNotificationManager.cs

@@ -31,8 +31,8 @@ namespace Avalonia.Controls.Notifications
         /// <seealso cref="NotificationPosition"/>
         public NotificationPosition Position
         {
-            get { return GetValue(PositionProperty); }
+            get => GetValue(PositionProperty);
-            set { SetValue(PositionProperty, value); }
+            set => SetValue(PositionProperty, value);
         }
 
         /// <summary>
@@ -46,10 +46,10 @@ namespace Avalonia.Controls.Notifications
         /// </summary>
         public int MaxItems
         {
-            get { return GetValue(MaxItemsProperty); }
+            get => GetValue(MaxItemsProperty);
-            set { SetValue(MaxItemsProperty, value); }
+            set => SetValue(MaxItemsProperty, value);
         }
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>

src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs

@@ -153,8 +153,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AllowSpin
         {
-            get { return GetValue(AllowSpinProperty); }
+            get => GetValue(AllowSpinProperty);
-            set { SetValue(AllowSpinProperty, value); }
+            set => SetValue(AllowSpinProperty, value);
         }
 
         /// <summary>
@@ -162,8 +162,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Location ButtonSpinnerLocation
         {
-            get { return GetValue(ButtonSpinnerLocationProperty); }
+            get => GetValue(ButtonSpinnerLocationProperty);
-            set { SetValue(ButtonSpinnerLocationProperty, value); }
+            set => SetValue(ButtonSpinnerLocationProperty, value);
         }
 
         /// <summary>
@@ -171,8 +171,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool ShowButtonSpinner
         {
-            get { return GetValue(ShowButtonSpinnerProperty); }
+            get => GetValue(ShowButtonSpinnerProperty);
-            set { SetValue(ShowButtonSpinnerProperty, value); }
+            set => SetValue(ShowButtonSpinnerProperty, value);
         }
 
         /// <summary>
@@ -198,8 +198,8 @@ namespace Avalonia.Controls
         /// </summary>
         public string FormatString
         {
-            get { return GetValue(FormatStringProperty); }
+            get => GetValue(FormatStringProperty);
-            set { SetValue(FormatStringProperty, value); }
+            set => SetValue(FormatStringProperty, value);
         }
 
         /// <summary>
@@ -207,8 +207,8 @@ namespace Avalonia.Controls
         /// </summary>
         public decimal Increment
         {
-            get { return GetValue(IncrementProperty); }
+            get => GetValue(IncrementProperty);
-            set { SetValue(IncrementProperty, value); }
+            set => SetValue(IncrementProperty, value);
         }
 
         /// <summary>
@@ -216,8 +216,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsReadOnly
         {
-            get { return GetValue(IsReadOnlyProperty); }
+            get => GetValue(IsReadOnlyProperty);
-            set { SetValue(IsReadOnlyProperty, value); }
+            set => SetValue(IsReadOnlyProperty, value);
         }
 
         /// <summary>
@@ -225,8 +225,8 @@ namespace Avalonia.Controls
         /// </summary>
         public decimal Maximum
         {
-            get { return GetValue(MaximumProperty); }
+            get => GetValue(MaximumProperty);
-            set { SetValue(MaximumProperty, value); }
+            set => SetValue(MaximumProperty, value);
         }
 
         /// <summary>
@@ -234,8 +234,8 @@ namespace Avalonia.Controls
         /// </summary>
         public decimal Minimum
         {
-            get { return GetValue(MinimumProperty); }
+            get => GetValue(MinimumProperty);
-            set { SetValue(MinimumProperty, value); }
+            set => SetValue(MinimumProperty, value);
         }
 
         /// <summary>
@@ -283,8 +283,8 @@ namespace Avalonia.Controls
         /// </summary>
         public string? Watermark
         {
-            get { return GetValue(WatermarkProperty); }
+            get => GetValue(WatermarkProperty);
-            set { SetValue(WatermarkProperty, value); }
+            set => SetValue(WatermarkProperty, value);
         }
 
         /// <summary>
@@ -973,8 +973,8 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler<NumericUpDownValueChangedEventArgs>? ValueChanged
         {
-            add { AddHandler(ValueChangedEvent, value); }
+            add => AddHandler(ValueChangedEvent, value);
-            remove { RemoveHandler(ValueChangedEvent, value); }
+            remove => RemoveHandler(ValueChangedEvent, value);
         }
 
         private bool CommitInput(bool forceTextUpdate = false)

src/Avalonia.Controls/Panel.cs

@@ -54,8 +54,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IBrush? Background
         {
-            get { return GetValue(BackgroundProperty); }
+            get => GetValue(BackgroundProperty);
-            set { SetValue(BackgroundProperty, value); }
+            set => SetValue(BackgroundProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/PathIcon.cs

@@ -14,8 +14,8 @@ namespace Avalonia.Controls
 
         public Geometry Data
         {
-            get { return GetValue(DataProperty); }
+            get => GetValue(DataProperty);
-            set { SetValue(DataProperty, value); }
+            set => SetValue(DataProperty, value);
         }
     }
 }

src/Avalonia.Controls/Presenters/ContentPresenter.cs

@@ -184,8 +184,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public IBrush? Background
         {
-            get { return GetValue(BackgroundProperty); }
+            get => GetValue(BackgroundProperty);
-            set { SetValue(BackgroundProperty, value); }
+            set => SetValue(BackgroundProperty, value);
         }
 
         /// <summary>
@@ -193,8 +193,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public IBrush? BorderBrush
         {
-            get { return GetValue(BorderBrushProperty); }
+            get => GetValue(BorderBrushProperty);
-            set { SetValue(BorderBrushProperty, value); }
+            set => SetValue(BorderBrushProperty, value);
         }
 
         /// <summary>
@@ -202,8 +202,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public Thickness BorderThickness
         {
-            get { return GetValue(BorderThicknessProperty); }
+            get => GetValue(BorderThicknessProperty);
-            set { SetValue(BorderThicknessProperty, value); }
+            set => SetValue(BorderThicknessProperty, value);
         }
 
         /// <summary>
@@ -211,8 +211,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public CornerRadius CornerRadius
         {
-            get { return GetValue(CornerRadiusProperty); }
+            get => GetValue(CornerRadiusProperty);
-            set { SetValue(CornerRadiusProperty, value); }
+            set => SetValue(CornerRadiusProperty, value);
         }
 
         /// <summary>
@@ -328,8 +328,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public Control? Child
         {
-            get { return _child; }
+            get => _child;
-            private set { SetAndRaise(ChildProperty, ref _child, value); }
+            private set => SetAndRaise(ChildProperty, ref _child, value);
         }
 
         /// <summary>
@@ -338,8 +338,8 @@ namespace Avalonia.Controls.Presenters
         [DependsOn(nameof(ContentTemplate))]
         public object? Content
         {
-            get { return GetValue(ContentProperty); }
+            get => GetValue(ContentProperty);
-            set { SetValue(ContentProperty, value); }
+            set => SetValue(ContentProperty, value);
         }
 
         /// <summary>
@@ -347,8 +347,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public IDataTemplate? ContentTemplate
         {
-            get { return GetValue(ContentTemplateProperty); }
+            get => GetValue(ContentTemplateProperty);
-            set { SetValue(ContentTemplateProperty, value); }
+            set => SetValue(ContentTemplateProperty, value);
         }
 
         /// <summary>
@@ -356,8 +356,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public HorizontalAlignment HorizontalContentAlignment
         {
-            get { return GetValue(HorizontalContentAlignmentProperty); }
+            get => GetValue(HorizontalContentAlignmentProperty);
-            set { SetValue(HorizontalContentAlignmentProperty, value); }
+            set => SetValue(HorizontalContentAlignmentProperty, value);
         }
 
         /// <summary>
@@ -365,8 +365,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public VerticalAlignment VerticalContentAlignment
         {
-            get { return GetValue(VerticalContentAlignmentProperty); }
+            get => GetValue(VerticalContentAlignmentProperty);
-            set { SetValue(VerticalContentAlignmentProperty, value); }
+            set => SetValue(VerticalContentAlignmentProperty, value);
         }
 
         /// <summary>
@@ -374,8 +374,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public Thickness Padding
         {
-            get { return GetValue(PaddingProperty); }
+            get => GetValue(PaddingProperty);
-            set { SetValue(PaddingProperty, value); }
+            set => SetValue(PaddingProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs

@@ -147,8 +147,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public Size Extent
         {
-            get { return _extent; }
+            get => _extent;
-            private set { SetAndRaise(ExtentProperty, ref _extent, value); }
+            private set => SetAndRaise(ExtentProperty, ref _extent, value);
         }
 
         /// <summary>
@@ -165,8 +165,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public Size Viewport
         {
-            get { return _viewport; }
+            get => _viewport;
-            private set { SetAndRaise(ViewportProperty, ref _viewport, value); }
+            private set => SetAndRaise(ViewportProperty, ref _viewport, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Primitives/AccessText.cs

@@ -53,8 +53,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public bool ShowAccessKey
         {
-            get { return GetValue(ShowAccessKeyProperty); }
+            get => GetValue(ShowAccessKeyProperty);
-            set { SetValue(ShowAccessKeyProperty, value); }
+            set => SetValue(ShowAccessKeyProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs

@@ -40,8 +40,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public object? Header
         {
-            get { return GetValue(HeaderProperty); }
+            get => GetValue(HeaderProperty);
-            set { SetValue(HeaderProperty, value); }
+            set => SetValue(HeaderProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs

@@ -40,8 +40,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public object? Header
         {
-            get { return GetValue(HeaderProperty); }
+            get => GetValue(HeaderProperty);
-            set { SetValue(HeaderProperty, value); }
+            set => SetValue(HeaderProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Primitives/ScrollBar.cs

@@ -110,8 +110,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public double ViewportSize
         {
-            get { return GetValue(ViewportSizeProperty); }
+            get => GetValue(ViewportSizeProperty);
-            set { SetValue(ViewportSizeProperty, value); }
+            set => SetValue(ViewportSizeProperty, value);
         }
 
         /// <summary>
@@ -120,8 +120,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public ScrollBarVisibility Visibility
         {
-            get { return GetValue(VisibilityProperty); }
+            get => GetValue(VisibilityProperty);
-            set { SetValue(VisibilityProperty, value); }
+            set => SetValue(VisibilityProperty, value);
         }
 
         /// <summary>
@@ -129,8 +129,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public Orientation Orientation
         {
-            get { return GetValue(OrientationProperty); }
+            get => GetValue(OrientationProperty);
-            set { SetValue(OrientationProperty, value); }
+            set => SetValue(OrientationProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

@@ -187,16 +187,14 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public int SelectedIndex
         {
-            get
+            get =>
-            {
                 // When a Begin/EndInit/DataContext update is in place we return the value to be
                 // updated here, even though it's not yet active and the property changed notification
                 // has not yet been raised. If we don't do this then the old value will be written back
                 // to the source when two-way bound, and the update value will be lost.
-                return _updateState?.SelectedIndex.HasValue == true ?
+                _updateState?.SelectedIndex.HasValue == true ?
                     _updateState.SelectedIndex.Value :
                     Selection.SelectedIndex;
-            }
             set
             {
                 if (_updateState is object)
@@ -215,13 +213,11 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public object? SelectedItem
         {
-            get
+            get =>
-            {
                 // See SelectedIndex setter for more information.
-                return _updateState?.SelectedItem.HasValue == true ?
+                _updateState?.SelectedItem.HasValue == true ?
                     _updateState.SelectedItem.Value :
                     Selection.SelectedItem;
-            }
             set
             {
                 if (_updateState is object)
@@ -306,12 +302,9 @@ namespace Avalonia.Controls.Primitives
         [AllowNull]
         protected ISelectionModel Selection
         {
-            get
+            get => _updateState?.Selection.HasValue == true ?
-            {
-                return _updateState?.Selection.HasValue == true ?
                     _updateState.Selection.Value :
                     GetOrCreateSelectionModel();
-            }
             set
             {
                 value ??= CreateDefaultSelectionModel();
@@ -1373,10 +1366,7 @@ namespace Avalonia.Controls.Primitives
             public Optional<object?> SelectedValue
             {
                 get => _selectedValue;
-                set
+                set => _selectedValue = value;
-                {
-                    _selectedValue = value;
-                }
             }
         }
 

src/Avalonia.Controls/Primitives/TemplatedControl.cs

@@ -118,8 +118,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public event EventHandler<TemplateAppliedEventArgs>? TemplateApplied
         {
-            add { AddHandler(TemplateAppliedEvent, value); }
+            add => AddHandler(TemplateAppliedEvent, value);
-            remove { RemoveHandler(TemplateAppliedEvent, value); }
+            remove => RemoveHandler(TemplateAppliedEvent, value);
         }
 
         /// <summary>
@@ -127,8 +127,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public IBrush? Background
         {
-            get { return GetValue(BackgroundProperty); }
+            get => GetValue(BackgroundProperty);
-            set { SetValue(BackgroundProperty, value); }
+            set => SetValue(BackgroundProperty, value);
         }
 
         /// <summary>
@@ -136,8 +136,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public IBrush? BorderBrush
         {
-            get { return GetValue(BorderBrushProperty); }
+            get => GetValue(BorderBrushProperty);
-            set { SetValue(BorderBrushProperty, value); }
+            set => SetValue(BorderBrushProperty, value);
         }
 
         /// <summary>
@@ -145,8 +145,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public Thickness BorderThickness
         {
-            get { return GetValue(BorderThicknessProperty); }
+            get => GetValue(BorderThicknessProperty);
-            set { SetValue(BorderThicknessProperty, value); }
+            set => SetValue(BorderThicknessProperty, value);
         }
 
         /// <summary>
@@ -154,8 +154,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public CornerRadius CornerRadius
         {
-            get { return GetValue(CornerRadiusProperty); }
+            get => GetValue(CornerRadiusProperty);
-            set { SetValue(CornerRadiusProperty, value); }
+            set => SetValue(CornerRadiusProperty, value);
         }
 
         /// <summary>
@@ -163,8 +163,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public FontFamily FontFamily
         {
-            get { return GetValue(FontFamilyProperty); }
+            get => GetValue(FontFamilyProperty);
-            set { SetValue(FontFamilyProperty, value); }
+            set => SetValue(FontFamilyProperty, value);
         }
 
         /// <summary>
@@ -172,8 +172,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public double FontSize
         {
-            get { return GetValue(FontSizeProperty); }
+            get => GetValue(FontSizeProperty);
-            set { SetValue(FontSizeProperty, value); }
+            set => SetValue(FontSizeProperty, value);
         }
 
         /// <summary>
@@ -181,8 +181,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public FontStyle FontStyle
         {
-            get { return GetValue(FontStyleProperty); }
+            get => GetValue(FontStyleProperty);
-            set { SetValue(FontStyleProperty, value); }
+            set => SetValue(FontStyleProperty, value);
         }
 
         /// <summary>
@@ -190,8 +190,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public FontWeight FontWeight
         {
-            get { return GetValue(FontWeightProperty); }
+            get => GetValue(FontWeightProperty);
-            set { SetValue(FontWeightProperty, value); }
+            set => SetValue(FontWeightProperty, value);
         }
 
         /// <summary>
@@ -199,8 +199,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public FontStretch FontStretch
         {
-            get { return GetValue(FontStretchProperty); }
+            get => GetValue(FontStretchProperty);
-            set { SetValue(FontStretchProperty, value); }
+            set => SetValue(FontStretchProperty, value);
         }
 
         /// <summary>
@@ -208,8 +208,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public IBrush? Foreground
         {
-            get { return GetValue(ForegroundProperty); }
+            get => GetValue(ForegroundProperty);
-            set { SetValue(ForegroundProperty, value); }
+            set => SetValue(ForegroundProperty, value);
         }
 
         /// <summary>
@@ -217,8 +217,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public Thickness Padding
         {
-            get { return GetValue(PaddingProperty); }
+            get => GetValue(PaddingProperty);
-            set { SetValue(PaddingProperty, value); }
+            set => SetValue(PaddingProperty, value);
         }
 
         /// <summary>
@@ -226,8 +226,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public IControlTemplate? Template
         {
-            get { return GetValue(TemplateProperty); }
+            get => GetValue(TemplateProperty);
-            set { SetValue(TemplateProperty, value); }
+            set => SetValue(TemplateProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Primitives/Thumb.cs

@@ -30,20 +30,20 @@ namespace Avalonia.Controls.Primitives
 
         public event EventHandler<VectorEventArgs>? DragStarted
         {
-            add { AddHandler(DragStartedEvent, value); }
+            add => AddHandler(DragStartedEvent, value);
-            remove { RemoveHandler(DragStartedEvent, value); }
+            remove => RemoveHandler(DragStartedEvent, value);
         }
 
         public event EventHandler<VectorEventArgs>? DragDelta
         {
-            add { AddHandler(DragDeltaEvent, value); }
+            add => AddHandler(DragDeltaEvent, value);
-            remove { RemoveHandler(DragDeltaEvent, value); }
+            remove => RemoveHandler(DragDeltaEvent, value);
         }
 
         public event EventHandler<VectorEventArgs>? DragCompleted
         {
-            add { AddHandler(DragCompletedEvent, value); }
+            add => AddHandler(DragCompletedEvent, value);
-            remove { RemoveHandler(DragCompletedEvent, value); }
+            remove => RemoveHandler(DragCompletedEvent, value);
         }
 
         internal void AdjustDrag(Vector v)

src/Avalonia.Controls/Primitives/Track.cs

@@ -80,45 +80,45 @@ namespace Avalonia.Controls.Primitives
 
         public double ViewportSize
         {
-            get { return GetValue(ViewportSizeProperty); }
+            get => GetValue(ViewportSizeProperty);
-            set { SetValue(ViewportSizeProperty, value); }
+            set => SetValue(ViewportSizeProperty, value);
         }
 
         public Orientation Orientation
         {
-            get { return GetValue(OrientationProperty); }
+            get => GetValue(OrientationProperty);
-            set { SetValue(OrientationProperty, value); }
+            set => SetValue(OrientationProperty, value);
         }
 
         [Content]
         public Thumb? Thumb
         {
-            get { return GetValue(ThumbProperty); }
+            get => GetValue(ThumbProperty);
-            set { SetValue(ThumbProperty, value); }
+            set => SetValue(ThumbProperty, value);
         }
 
         public Button? IncreaseButton
         {
-            get { return GetValue(IncreaseButtonProperty); }
+            get => GetValue(IncreaseButtonProperty);
-            set { SetValue(IncreaseButtonProperty, value); }
+            set => SetValue(IncreaseButtonProperty, value);
         }
 
         public Button? DecreaseButton
         {
-            get { return GetValue(DecreaseButtonProperty); }
+            get => GetValue(DecreaseButtonProperty);
-            set { SetValue(DecreaseButtonProperty, value); }
+            set => SetValue(DecreaseButtonProperty, value);
         }
 
         public bool IsDirectionReversed
         {
-            get { return GetValue(IsDirectionReversedProperty); }
+            get => GetValue(IsDirectionReversedProperty);
-            set { SetValue(IsDirectionReversedProperty, value); }
+            set => SetValue(IsDirectionReversedProperty, value);
         }
 
         public bool IgnoreThumbDrag
         {
-            get { return GetValue(IgnoreThumbDragProperty); }
+            get => GetValue(IgnoreThumbDragProperty);
-            set { SetValue(IgnoreThumbDragProperty, value); }
+            set => SetValue(IgnoreThumbDragProperty, value);
         }
 
         private double ThumbCenterOffset { get; set; }

src/Avalonia.Controls/ProgressBar.cs

@@ -231,7 +231,7 @@ namespace Avalonia.Controls
         public double Percentage
         {
             get => _percentage;
-            private set { SetAndRaise(PercentageProperty, ref _percentage, value); }
+            private set => SetAndRaise(PercentageProperty, ref _percentage, value);
         }
 
         static ProgressBar()

src/Avalonia.Controls/PullToRefresh/RefreshInfoProvider.cs

@@ -61,10 +61,7 @@ namespace Avalonia.Controls.PullToRefresh
         public double InteractionRatio
         {
             get => _interactionRatio;
-            set
+            set => SetAndRaise(InteractionRatioProperty, ref _interactionRatio, value);
-            {
-                SetAndRaise(InteractionRatioProperty, ref _interactionRatio, value);
-            }
         }
 
         public double ExecutionRatio

src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs

@@ -74,10 +74,7 @@ namespace Avalonia.Controls
         [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1032", Justification = "False positive")]
         protected RefreshVisualizerState RefreshVisualizerState
         {
-            get
+            get => _refreshVisualizerState;
-            {
-                return _refreshVisualizerState;
-            }
             private set
             {
                 SetAndRaise(RefreshVisualizerStateProperty, ref _refreshVisualizerState, value);
@@ -90,14 +87,8 @@ namespace Avalonia.Controls
         /// </summary>
         public RefreshVisualizerOrientation Orientation
         {
-            get
+            get => _orientation;
-            {
+            set => SetAndRaise(OrientationProperty, ref _orientation, value);
-                return _orientation;
-            }
-            set
-            {
-                SetAndRaise(OrientationProperty, ref _orientation, value);
-            }
         }
 
         internal PullDirection PullDirection

src/Avalonia.Controls/RepeatButton.cs

@@ -28,8 +28,8 @@ namespace Avalonia.Controls
         /// </summary>
         public int Interval
         {
-            get { return GetValue(IntervalProperty); }
+            get => GetValue(IntervalProperty);
-            set { SetValue(IntervalProperty, value); }
+            set => SetValue(IntervalProperty, value);
         }
 
         /// <summary>
@@ -37,8 +37,8 @@ namespace Avalonia.Controls
         /// </summary>
         public int Delay
         {
-            get { return GetValue(DelayProperty); }
+            get => GetValue(DelayProperty);
-            set { SetValue(DelayProperty, value); }
+            set => SetValue(DelayProperty, value);
         }
 
         private void StartTimer()

src/Avalonia.Controls/RowDefinition.cs

@@ -69,14 +69,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double MaxHeight
         {
-            get
+            get => GetValue(MaxHeightProperty);
-            {
+            set => SetValue(MaxHeightProperty, value);
-                return GetValue(MaxHeightProperty);
-            }
-            set
-            {
-                SetValue(MaxHeightProperty, value);
-            }
         }
 
         /// <summary>
@@ -84,14 +78,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double MinHeight
         {
-            get
+            get => GetValue(MinHeightProperty);
-            {
+            set => SetValue(MinHeightProperty, value);
-                return GetValue(MinHeightProperty);
-            }
-            set
-            {
-                SetValue(MinHeightProperty, value);
-            }
         }
 
         /// <summary>
@@ -99,14 +87,8 @@ namespace Avalonia.Controls
         /// </summary>
         public GridLength Height
         {
-            get
+            get => GetValue(HeightProperty);
-            {
+            set => SetValue(HeightProperty, value);
-                return GetValue(HeightProperty);
-            }
-            set
-            {
-                SetValue(HeightProperty, value);
-            }
         }
 
         internal override GridLength UserSizeValueCache => this.Height;

src/Avalonia.Controls/ScrollViewer.cs

@@ -205,10 +205,7 @@ namespace Avalonia.Controls
         /// </summary>
         public Size Extent
         {
-            get
+            get => _extent;
-            {
-                return _extent;
-            }
 
             internal set
             {
@@ -233,10 +230,7 @@ namespace Avalonia.Controls
         /// </summary>
         public Size Viewport
         {
-            get
+            get => _viewport;
-            {
-                return _viewport;
-            }
 
             internal set
             {
@@ -262,8 +256,8 @@ namespace Avalonia.Controls
         /// </summary>
         public ScrollBarVisibility HorizontalScrollBarVisibility
         {
-            get { return GetValue(HorizontalScrollBarVisibilityProperty); }
+            get => GetValue(HorizontalScrollBarVisibilityProperty);
-            set { SetValue(HorizontalScrollBarVisibilityProperty, value); }
+            set => SetValue(HorizontalScrollBarVisibilityProperty, value);
         }
 
         /// <summary>
@@ -271,8 +265,8 @@ namespace Avalonia.Controls
         /// </summary>
         public ScrollBarVisibility VerticalScrollBarVisibility
         {
-            get { return GetValue(VerticalScrollBarVisibilityProperty); }
+            get => GetValue(VerticalScrollBarVisibilityProperty);
-            set { SetValue(VerticalScrollBarVisibilityProperty, value); }
+            set => SetValue(VerticalScrollBarVisibilityProperty, value);
         }
 
         /// <summary>
@@ -280,7 +274,7 @@ namespace Avalonia.Controls
         /// </summary>
         protected bool CanHorizontallyScroll
         {
-            get { return HorizontalScrollBarVisibility != ScrollBarVisibility.Disabled; }
+            get => HorizontalScrollBarVisibility != ScrollBarVisibility.Disabled;
         }
 
         /// <summary>
@@ -288,7 +282,7 @@ namespace Avalonia.Controls
         /// </summary>
         protected bool CanVerticallyScroll
         {
-            get { return VerticalScrollBarVisibility != ScrollBarVisibility.Disabled; }
+            get => VerticalScrollBarVisibility != ScrollBarVisibility.Disabled;
         }
 
         /// <inheritdoc/>

src/Avalonia.Controls/Shapes/Line.cs

@@ -18,14 +18,14 @@ namespace Avalonia.Controls.Shapes
 
         public Point StartPoint
         {
-            get { return GetValue(StartPointProperty); }
+            get => GetValue(StartPointProperty);
-            set { SetValue(StartPointProperty, value); }
+            set => SetValue(StartPointProperty, value);
         }
 
         public Point EndPoint
         {
-            get { return GetValue(EndPointProperty); }
+            get => GetValue(EndPointProperty);
-            set { SetValue(EndPointProperty, value); }
+            set => SetValue(EndPointProperty, value);
         }
 
         protected override Geometry CreateDefiningGeometry()

src/Avalonia.Controls/Shapes/Path.cs

@@ -18,8 +18,8 @@ namespace Avalonia.Controls.Shapes
 
         public Geometry Data
         {
-            get { return GetValue(DataProperty); }
+            get => GetValue(DataProperty);
-            set { SetValue(DataProperty, value); }
+            set => SetValue(DataProperty, value);
         }
 
         private EventHandler? GeometryChangedHandler => _geometryChangedHandler ??= GeometryChanged;

src/Avalonia.Controls/Slider.cs

@@ -136,8 +136,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Orientation Orientation
         {
-            get { return GetValue(OrientationProperty); }
+            get => GetValue(OrientationProperty);
-            set { SetValue(OrientationProperty, value); }
+            set => SetValue(OrientationProperty, value);
         }
 
         /// <summary>
@@ -149,8 +149,8 @@ namespace Avalonia.Controls
         /// </value>
         public bool IsDirectionReversed
         {
-            get { return GetValue(IsDirectionReversedProperty); }
+            get => GetValue(IsDirectionReversedProperty);
-            set { SetValue(IsDirectionReversedProperty, value); }
+            set => SetValue(IsDirectionReversedProperty, value);
         }
 
         /// <summary>
@@ -158,8 +158,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsSnapToTickEnabled
         {
-            get { return GetValue(IsSnapToTickEnabledProperty); }
+            get => GetValue(IsSnapToTickEnabledProperty);
-            set { SetValue(IsSnapToTickEnabledProperty, value); }
+            set => SetValue(IsSnapToTickEnabledProperty, value);
         }
 
         /// <summary>
@@ -167,8 +167,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double TickFrequency
         {
-            get { return GetValue(TickFrequencyProperty); }
+            get => GetValue(TickFrequencyProperty);
-            set { SetValue(TickFrequencyProperty, value); }
+            set => SetValue(TickFrequencyProperty, value);
         }
 
         /// <summary>
@@ -177,8 +177,8 @@ namespace Avalonia.Controls
         /// </summary>
         public TickPlacement TickPlacement
         {
-            get { return GetValue(TickPlacementProperty); }
+            get => GetValue(TickPlacementProperty);
-            set { SetValue(TickPlacementProperty, value); }
+            set => SetValue(TickPlacementProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Spinner.cs

@@ -117,8 +117,8 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler<SpinEventArgs>? Spin
         {
-            add { AddHandler(SpinEvent, value); }
+            add => AddHandler(SpinEvent, value);
-            remove { RemoveHandler(SpinEvent, value); }
+            remove => RemoveHandler(SpinEvent, value);
         }
 
         /// <summary>
@@ -126,8 +126,8 @@ namespace Avalonia.Controls
         /// </summary>
         public ValidSpinDirections ValidSpinDirection
         {
-            get { return GetValue(ValidSpinDirectionProperty); }
+            get => GetValue(ValidSpinDirectionProperty);
-            set { SetValue(ValidSpinDirectionProperty, value); }
+            set => SetValue(ValidSpinDirectionProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/StackPanel.cs

@@ -72,8 +72,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double Spacing
         {
-            get { return GetValue(SpacingProperty); }
+            get => GetValue(SpacingProperty);
-            set { SetValue(SpacingProperty, value); }
+            set => SetValue(SpacingProperty, value);
         }
 
         /// <summary>
@@ -81,8 +81,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Orientation Orientation
         {
-            get { return GetValue(OrientationProperty); }
+            get => GetValue(OrientationProperty);
-            set { SetValue(OrientationProperty, value); }
+            set => SetValue(OrientationProperty, value);
         }
 
         /// <summary>
@@ -108,8 +108,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AreHorizontalSnapPointsRegular
         {
-            get { return GetValue(AreHorizontalSnapPointsRegularProperty); }
+            get => GetValue(AreHorizontalSnapPointsRegularProperty);
-            set { SetValue(AreHorizontalSnapPointsRegularProperty, value); }
+            set => SetValue(AreHorizontalSnapPointsRegularProperty, value);
         }
 
         /// <summary>
@@ -117,8 +117,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AreVerticalSnapPointsRegular
         {
-            get { return GetValue(AreVerticalSnapPointsRegularProperty); }
+            get => GetValue(AreVerticalSnapPointsRegularProperty);
-            set { SetValue(AreVerticalSnapPointsRegularProperty, value); }
+            set => SetValue(AreVerticalSnapPointsRegularProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/TabControl.cs

@@ -84,8 +84,8 @@ namespace Avalonia.Controls
         /// </summary>
         public HorizontalAlignment HorizontalContentAlignment
         {
-            get { return GetValue(HorizontalContentAlignmentProperty); }
+            get => GetValue(HorizontalContentAlignmentProperty);
-            set { SetValue(HorizontalContentAlignmentProperty, value); }
+            set => SetValue(HorizontalContentAlignmentProperty, value);
         }
 
         /// <summary>
@@ -93,8 +93,8 @@ namespace Avalonia.Controls
         /// </summary>
         public VerticalAlignment VerticalContentAlignment
         {
-            get { return GetValue(VerticalContentAlignmentProperty); }
+            get => GetValue(VerticalContentAlignmentProperty);
-            set { SetValue(VerticalContentAlignmentProperty, value); }
+            set => SetValue(VerticalContentAlignmentProperty, value);
         }
 
         /// <summary>
@@ -102,8 +102,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Dock TabStripPlacement
         {
-            get { return GetValue(TabStripPlacementProperty); }
+            get => GetValue(TabStripPlacementProperty);
-            set { SetValue(TabStripPlacementProperty, value); }
+            set => SetValue(TabStripPlacementProperty, value);
         }
 
         /// <summary>
@@ -111,8 +111,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IDataTemplate? ContentTemplate
         {
-            get { return GetValue(ContentTemplateProperty); }
+            get => GetValue(ContentTemplateProperty);
-            set { SetValue(ContentTemplateProperty, value); }
+            set => SetValue(ContentTemplateProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/TabItem.cs

@@ -53,8 +53,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsSelected
         {
-            get { return GetValue(IsSelectedProperty); }
+            get => GetValue(IsSelectedProperty);
-            set { SetValue(IsSelectedProperty, value); }
+            set => SetValue(IsSelectedProperty, value);
         }
 
         protected override AutomationPeer OnCreateAutomationPeer() => new ListItemAutomationPeer(this);

src/Avalonia.Controls/TextBlock.cs

@@ -178,8 +178,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Thickness Padding
         {
-            get { return GetValue(PaddingProperty); }
+            get => GetValue(PaddingProperty);
-            set { SetValue(PaddingProperty, value); }
+            set => SetValue(PaddingProperty, value);
         }
 
         /// <summary>
@@ -187,8 +187,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IBrush? Background
         {
-            get { return GetValue(BackgroundProperty); }
+            get => GetValue(BackgroundProperty);
-            set { SetValue(BackgroundProperty, value); }
+            set => SetValue(BackgroundProperty, value);
         }
 
         /// <summary>
@@ -207,8 +207,8 @@ namespace Avalonia.Controls
         /// </summary>
         public FontFamily FontFamily
         {
-            get { return GetValue(FontFamilyProperty); }
+            get => GetValue(FontFamilyProperty);
-            set { SetValue(FontFamilyProperty, value); }
+            set => SetValue(FontFamilyProperty, value);
         }
 
         /// <summary>
@@ -216,8 +216,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double FontSize
         {
-            get { return GetValue(FontSizeProperty); }
+            get => GetValue(FontSizeProperty);
-            set { SetValue(FontSizeProperty, value); }
+            set => SetValue(FontSizeProperty, value);
         }
 
         /// <summary>
@@ -225,8 +225,8 @@ namespace Avalonia.Controls
         /// </summary>
         public FontStyle FontStyle
         {
-            get { return GetValue(FontStyleProperty); }
+            get => GetValue(FontStyleProperty);
-            set { SetValue(FontStyleProperty, value); }
+            set => SetValue(FontStyleProperty, value);
         }
 
         /// <summary>
@@ -234,8 +234,8 @@ namespace Avalonia.Controls
         /// </summary>
         public FontWeight FontWeight
         {
-            get { return GetValue(FontWeightProperty); }
+            get => GetValue(FontWeightProperty);
-            set { SetValue(FontWeightProperty, value); }
+            set => SetValue(FontWeightProperty, value);
         }
 
         /// <summary>
@@ -243,8 +243,8 @@ namespace Avalonia.Controls
         /// </summary>
         public FontStretch FontStretch
         {
-            get { return GetValue(FontStretchProperty); }
+            get => GetValue(FontStretchProperty);
-            set { SetValue(FontStretchProperty, value); }
+            set => SetValue(FontStretchProperty, value);
         }
 
         /// <summary>
@@ -252,8 +252,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IBrush? Foreground
         {
-            get { return GetValue(ForegroundProperty); }
+            get => GetValue(ForegroundProperty);
-            set { SetValue(ForegroundProperty, value); }
+            set => SetValue(ForegroundProperty, value);
         }
 
         /// <summary>
@@ -288,8 +288,8 @@ namespace Avalonia.Controls
         /// </summary>
         public TextWrapping TextWrapping
         {
-            get { return GetValue(TextWrappingProperty); }
+            get => GetValue(TextWrappingProperty);
-            set { SetValue(TextWrappingProperty, value); }
+            set => SetValue(TextWrappingProperty, value);
         }
 
         /// <summary>
@@ -297,8 +297,8 @@ namespace Avalonia.Controls
         /// </summary>
         public TextTrimming TextTrimming
         {
-            get { return GetValue(TextTrimmingProperty); }
+            get => GetValue(TextTrimmingProperty);
-            set { SetValue(TextTrimmingProperty, value); }
+            set => SetValue(TextTrimmingProperty, value);
         }
 
         /// <summary>
@@ -306,8 +306,8 @@ namespace Avalonia.Controls
         /// </summary>
         public TextAlignment TextAlignment
         {
-            get { return GetValue(TextAlignmentProperty); }
+            get => GetValue(TextAlignmentProperty);
-            set { SetValue(TextAlignmentProperty, value); }
+            set => SetValue(TextAlignmentProperty, value);
         }
 
         /// <summary>
@@ -338,8 +338,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double BaselineOffset
         {
-            get { return (double)GetValue(BaselineOffsetProperty); }
+            get => (double)GetValue(BaselineOffsetProperty);
-            set { SetValue(BaselineOffsetProperty, value); }
+            set => SetValue(BaselineOffsetProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/TickBar.cs

@@ -62,8 +62,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IBrush? Fill
         {
-            get { return GetValue(FillProperty); }
+            get => GetValue(FillProperty);
-            set { SetValue(FillProperty, value); }
+            set => SetValue(FillProperty, value);
         }
 
         /// <summary>
@@ -77,11 +77,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double Minimum
         {
-            get { return GetValue(MinimumProperty); }
+            get => GetValue(MinimumProperty);
-            set
+            set => SetValue(MinimumProperty, value);
-            {
-                SetValue(MinimumProperty, value);
-            }
         }
 
         /// <summary>
@@ -95,8 +92,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double Maximum
         {
-            get { return GetValue(MaximumProperty); }
+            get => GetValue(MaximumProperty);
-            set { SetValue(MaximumProperty, value); }
+            set => SetValue(MaximumProperty, value);
         }
 
         /// <summary>
@@ -110,8 +107,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double TickFrequency
         {
-            get { return GetValue(TickFrequencyProperty); }
+            get => GetValue(TickFrequencyProperty);
-            set { SetValue(TickFrequencyProperty, value); }
+            set => SetValue(TickFrequencyProperty, value);
         }
 
         /// <summary>
@@ -125,8 +122,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Orientation Orientation
         {
-            get { return GetValue(OrientationProperty); }
+            get => GetValue(OrientationProperty);
-            set { SetValue(OrientationProperty, value); }
+            set => SetValue(OrientationProperty, value);
         }
 
         /// <summary>
@@ -142,8 +139,8 @@ namespace Avalonia.Controls
         /// </summary>
         public AvaloniaList<double>? Ticks
         {
-            get { return GetValue(TicksProperty); }
+            get => GetValue(TicksProperty);
-            set { SetValue(TicksProperty, value); }
+            set => SetValue(TicksProperty, value);
         }
 
         /// <summary>
@@ -160,8 +157,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsDirectionReversed
         {
-            get { return GetValue(IsDirectionReversedProperty); }
+            get => GetValue(IsDirectionReversedProperty);
-            set { SetValue(IsDirectionReversedProperty, value); }
+            set => SetValue(IsDirectionReversedProperty, value);
         }
 
         /// <summary>
@@ -177,8 +174,8 @@ namespace Avalonia.Controls
         /// </summary>
         public TickBarPlacement Placement
         {
-            get { return GetValue(PlacementProperty); }
+            get => GetValue(PlacementProperty);
-            set { SetValue(PlacementProperty, value); }
+            set => SetValue(PlacementProperty, value);
         }
 
         /// <summary>
@@ -195,8 +192,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Rect ReservedSpace
         {
-            get { return GetValue(ReservedSpaceProperty); }
+            get => GetValue(ReservedSpaceProperty);
-            set { SetValue(ReservedSpaceProperty, value); }
+            set => SetValue(ReservedSpaceProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/ToggleSwitch.cs

@@ -85,8 +85,8 @@ namespace Avalonia.Controls
         /// </summary>
         public object? OnContent
         {
-            get { return GetValue(OnContentProperty); }
+            get => GetValue(OnContentProperty);
-            set { SetValue(OnContentProperty, value); }
+            set => SetValue(OnContentProperty, value);
         }
 
         /// <summary>
@@ -94,8 +94,8 @@ namespace Avalonia.Controls
         /// </summary>
         public object? OffContent
         {
-            get { return GetValue(OffContentProperty); }
+            get => GetValue(OffContentProperty);
-            set { SetValue(OffContentProperty, value); }
+            set => SetValue(OffContentProperty, value);
         }
 
         public ContentPresenter? OffContentPresenter
@@ -115,8 +115,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IDataTemplate? OffContentTemplate
         {
-            get { return GetValue(OffContentTemplateProperty); }
+            get => GetValue(OffContentTemplateProperty);
-            set { SetValue(OffContentTemplateProperty, value); }
+            set => SetValue(OffContentTemplateProperty, value);
         }
 
         /// <summary>
@@ -124,8 +124,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IDataTemplate? OnContentTemplate
         {
-            get { return GetValue(OnContentTemplateProperty); }
+            get => GetValue(OnContentTemplateProperty);
-            set { SetValue(OnContentTemplateProperty, value); }
+            set => SetValue(OnContentTemplateProperty, value);
         }
 
         /// <summary>
@@ -133,11 +133,11 @@ namespace Avalonia.Controls
         /// </summary>
         public Transitions KnobTransitions
         {
-            get { return GetValue(KnobTransitionsProperty); }
+            get => GetValue(KnobTransitionsProperty);
-            set { SetValue(KnobTransitionsProperty, value); }
+            set => SetValue(KnobTransitionsProperty, value);
         }
 
-        
+
 
         private void OffContentChanged(AvaloniaPropertyChangedEventArgs e)
         {

src/Avalonia.Controls/TopLevel.cs

@@ -318,8 +318,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Size ClientSize
         {
-            get { return _clientSize; }
+            get => _clientSize;
-            protected set { SetAndRaise(ClientSizeProperty, ref _clientSize, value); }
+            protected set => SetAndRaise(ClientSizeProperty, ref _clientSize, value);
         }
 
         /// <summary>
@@ -327,8 +327,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Size? FrameSize
         {
-            get { return _frameSize; }
+            get => _frameSize;
-            protected set { SetAndRaise(FrameSizeProperty, ref _frameSize, value); }
+            protected set => SetAndRaise(FrameSizeProperty, ref _frameSize, value);
         }
 
         /// <summary>
@@ -339,8 +339,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IReadOnlyList<WindowTransparencyLevel> TransparencyLevelHint
         {
-            get { return GetValue(TransparencyLevelHintProperty); }
+            get => GetValue(TransparencyLevelHintProperty);
-            set { SetValue(TransparencyLevelHintProperty, value); }
+            set => SetValue(TransparencyLevelHintProperty, value);
         }
 
         /// <summary>
@@ -374,8 +374,8 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler<RoutedEventArgs> BackRequested
         {
-            add { AddHandler(BackRequestedEvent, value); }
+            add => AddHandler(BackRequestedEvent, value);
-            remove { RemoveHandler(BackRequestedEvent, value); }
+            remove => RemoveHandler(BackRequestedEvent, value);
         }
 
         internal ILayoutManager LayoutManager
@@ -464,8 +464,8 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         IInputElement? IInputRoot.PointerOverElement
         {
-            get { return GetValue(PointerOverElementProperty); }
+            get => GetValue(PointerOverElementProperty);
-            set { SetValue(PointerOverElementProperty, value); }
+            set => SetValue(PointerOverElementProperty, value);
         }
 
         /// <summary>
@@ -473,8 +473,8 @@ namespace Avalonia.Controls
         /// </summary>
         bool IInputRoot.ShowAccessKeys
         {
-            get { return GetValue(AccessText.ShowAccessKeyProperty); }
+            get => GetValue(AccessText.ShowAccessKeyProperty);
-            set { SetValue(AccessText.ShowAccessKeyProperty, value); }
+            set => SetValue(AccessText.ShowAccessKeyProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/TrayIcon.cs

@@ -140,8 +140,8 @@ namespace Avalonia.Controls
         /// </summary>
         public object? CommandParameter
         {
-            get { return GetValue(CommandParameterProperty); }
+            get => GetValue(CommandParameterProperty);
-            set { SetValue(CommandParameterProperty, value); }
+            set => SetValue(CommandParameterProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs

@@ -40,7 +40,7 @@ namespace Avalonia.Controls.Utils
         /// control.</value>
         public SelectingItemsControl? SelectorControl
         {
-            get { return _selector; }
+            get => _selector;
 
             set
             {
@@ -111,10 +111,7 @@ namespace Avalonia.Controls.Utils
         /// <value>The selected item of the underlying selection adapter.</value>
         public object? SelectedItem
         {
-            get
+            get => SelectorControl?.SelectedItem;
-            {
-                return SelectorControl?.SelectedItem;
-            }
 
             set
             {
@@ -142,10 +139,7 @@ namespace Avalonia.Controls.Utils
         /// adapter.</value>
         public IEnumerable? ItemsSource
         {
-            get
+            get => SelectorControl?.ItemsSource;
-            {
-                return SelectorControl?.ItemsSource;
-            }
             set
             {
                 if (SelectorControl != null)

src/Avalonia.Controls/VirtualizingStackPanel.cs

@@ -119,8 +119,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AreHorizontalSnapPointsRegular
         {
-            get { return GetValue(AreHorizontalSnapPointsRegularProperty); }
+            get => GetValue(AreHorizontalSnapPointsRegularProperty);
-            set { SetValue(AreHorizontalSnapPointsRegularProperty, value); }
+            set => SetValue(AreHorizontalSnapPointsRegularProperty, value);
         }
 
         /// <summary>
@@ -128,8 +128,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AreVerticalSnapPointsRegular
         {
-            get { return GetValue(AreVerticalSnapPointsRegularProperty); }
+            get => GetValue(AreVerticalSnapPointsRegularProperty);
-            set { SetValue(AreVerticalSnapPointsRegularProperty, value); }
+            set => SetValue(AreVerticalSnapPointsRegularProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/Window.cs

@@ -245,8 +245,8 @@ namespace Avalonia.Controls
         /// </remarks>
         public SizeToContent SizeToContent
         {
-            get { return GetValue(SizeToContentProperty); }
+            get => GetValue(SizeToContentProperty);
-            set { SetValue(SizeToContentProperty, value); }
+            set => SetValue(SizeToContentProperty, value);
         }
 
         /// <summary>
@@ -254,8 +254,8 @@ namespace Avalonia.Controls
         /// </summary>
         public string? Title
         {
-            get { return GetValue(TitleProperty); }
+            get => GetValue(TitleProperty);
-            set { SetValue(TitleProperty, value); }
+            set => SetValue(TitleProperty, value);
         }
 
         /// <summary>
@@ -263,8 +263,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool ExtendClientAreaToDecorationsHint
         {
-            get { return GetValue(ExtendClientAreaToDecorationsHintProperty); }
+            get => GetValue(ExtendClientAreaToDecorationsHintProperty);
-            set { SetValue(ExtendClientAreaToDecorationsHintProperty, value); }
+            set => SetValue(ExtendClientAreaToDecorationsHintProperty, value);
         }
 
         /// <summary>
@@ -323,8 +323,8 @@ namespace Avalonia.Controls
         /// </summary>
         public SystemDecorations SystemDecorations
         {
-            get { return GetValue(SystemDecorationsProperty); }
+            get => GetValue(SystemDecorationsProperty);
-            set { SetValue(SystemDecorationsProperty, value); }
+            set => SetValue(SystemDecorationsProperty, value);
         }
 
         /// <summary>
@@ -332,8 +332,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool ShowActivated
         {
-            get { return GetValue(ShowActivatedProperty); }
+            get => GetValue(ShowActivatedProperty);
-            set { SetValue(ShowActivatedProperty, value); }
+            set => SetValue(ShowActivatedProperty, value);
         }
 
         /// <summary>
@@ -342,8 +342,8 @@ namespace Avalonia.Controls
         /// 
         public bool ShowInTaskbar
         {
-            get { return GetValue(ShowInTaskbarProperty); }
+            get => GetValue(ShowInTaskbarProperty);
-            set { SetValue(ShowInTaskbarProperty, value); }
+            set => SetValue(ShowInTaskbarProperty, value);
         }
 
         /// <summary>
@@ -351,8 +351,8 @@ namespace Avalonia.Controls
         /// </summary>
         public WindowState WindowState
         {
-            get { return GetValue(WindowStateProperty); }
+            get => GetValue(WindowStateProperty);
-            set { SetValue(WindowStateProperty, value); }
+            set => SetValue(WindowStateProperty, value);
         }
 
         /// <summary>
@@ -360,8 +360,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool CanResize
         {
-            get { return GetValue(CanResizeProperty); }
+            get => GetValue(CanResizeProperty);
-            set { SetValue(CanResizeProperty, value); }
+            set => SetValue(CanResizeProperty, value);
         }
 
         /// <summary>
@@ -369,8 +369,8 @@ namespace Avalonia.Controls
         /// </summary>
         public WindowIcon? Icon
         {
-            get { return GetValue(IconProperty); }
+            get => GetValue(IconProperty);
-            set { SetValue(IconProperty, value); }
+            set => SetValue(IconProperty, value);
         }
 
         /// <summary>
@@ -387,11 +387,8 @@ namespace Avalonia.Controls
         /// </summary>
         public PixelPoint Position
         {
-            get { return PlatformImpl?.Position ?? PixelPoint.Origin; }
+            get => PlatformImpl?.Position ?? PixelPoint.Origin;
-            set
+            set => PlatformImpl?.Move(value);
-            {
-                PlatformImpl?.Move(value);
-            }
         }
 
         /// <summary>

src/Avalonia.Controls/WindowBase.cs

@@ -102,10 +102,10 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsActive
         {
-            get { return _isActive; }
+            get => _isActive;
-            private set { SetAndRaise(IsActiveProperty, ref _isActive, value); }
+            private set => SetAndRaise(IsActiveProperty, ref _isActive, value);
         }
-        
+
         public Screens Screens { get; }
 
         /// <summary>
@@ -113,8 +113,8 @@ namespace Avalonia.Controls
         /// </summary>
         public WindowBase? Owner
         {
-            get { return _owner; }
+            get => _owner;
-            protected set { SetAndRaise(OwnerProperty, ref _owner, value); }
+            protected set => SetAndRaise(OwnerProperty, ref _owner, value);
         }
 
         /// <summary>
@@ -122,8 +122,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool Topmost
         {
-            get { return GetValue(TopmostProperty); }
+            get => GetValue(TopmostProperty);
-            set { SetValue(TopmostProperty, value); }
+            set => SetValue(TopmostProperty, value);
         }
 
         /// <summary>

src/Avalonia.Controls/WrapPanel.cs

@@ -50,8 +50,8 @@ namespace Avalonia.Controls
         /// </summary>
         public Orientation Orientation
         {
-            get { return GetValue(OrientationProperty); }
+            get => GetValue(OrientationProperty);
-            set { SetValue(OrientationProperty, value); }
+            set => SetValue(OrientationProperty, value);
         }
 
         /// <summary>
@@ -59,8 +59,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double ItemWidth
         {
-            get { return GetValue(ItemWidthProperty); }
+            get => GetValue(ItemWidthProperty);
-            set { SetValue(ItemWidthProperty, value); }
+            set => SetValue(ItemWidthProperty, value);
         }
 
         /// <summary>
@@ -68,8 +68,8 @@ namespace Avalonia.Controls
         /// </summary>
         public double ItemHeight
         {
-            get { return GetValue(ItemHeightProperty); }
+            get => GetValue(ItemHeightProperty);
-            set { SetValue(ItemHeightProperty, value); }
+            set => SetValue(ItemHeightProperty, value);
         }
 
         /// <summary>
@@ -279,12 +279,12 @@ namespace Avalonia.Controls
 
             internal double Width
             {
-                get { return _orientation == Orientation.Horizontal ? U : V; }
+                get => _orientation == Orientation.Horizontal ? U : V;
                 set { if (_orientation == Orientation.Horizontal) U = value; else V = value; }
             }
             internal double Height
             {
-                get { return _orientation == Orientation.Horizontal ? V : U; }
+                get => _orientation == Orientation.Horizontal ? V : U;
                 set { if (_orientation == Orientation.Horizontal) V = value; else U = value; }
             }
         }