diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs index 183882ca50..0628e0c0b9 100644 --- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs +++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs @@ -364,6 +364,7 @@ namespace Avalonia.Controls.Presenters /// /// Gets or sets the content to be displayed by the presenter. /// + [Content] [DependsOn(nameof(ContentTemplate))] public object? Content { diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs index e6260f6eec..3c6f895ea8 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs @@ -42,6 +42,17 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml Assert.Equal("Foo", target.Content); } + [Fact] + public void ContentPresenter_Default_Content_Property_Is_Set() + { + var xaml = @"Foo"; + + var target = AvaloniaRuntimeXamlLoader.Parse(xaml); + + Assert.NotNull(target); + Assert.Equal("Foo", target.Content); + } + [Fact] public void Attached_Property_Is_Set() {