diff --git a/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
index 3d63d122c3a6..0d59f419a08b 100644
--- a/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
+++ b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
@@ -1,10 +1,12 @@
#nullable disable
using System;
+using System.Diagnostics;
using Microsoft.Maui.Graphics;
namespace Microsoft.Maui.Controls
{
///
+ [DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
public partial class ActivityIndicator : View, IColorElement, IElementConfiguration, IActivityIndicator
{
/// Bindable property for .
@@ -40,5 +42,10 @@ public IPlatformElementConfiguration On() where T : ICo
{
return _platformConfigurationRegistry.Value.On();
}
+
+ private protected override string GetDebuggerDisplay()
+ {
+ return $"IsRunning = {IsRunning}, {base.GetDebuggerDisplay()}";
+ }
}
}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Application/Application.cs b/src/Controls/src/Core/Application/Application.cs
index 5bde671e5db3..e8b80ad8b87e 100644
--- a/src/Controls/src/Core/Application/Application.cs
+++ b/src/Controls/src/Core/Application/Application.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
+using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using System.Threading.Tasks;
diff --git a/src/Controls/src/Core/Button/Button.cs b/src/Controls/src/Core/Button/Button.cs
index 8cab188ab4d2..071dedca2273 100644
--- a/src/Controls/src/Core/Button/Button.cs
+++ b/src/Controls/src/Core/Button/Button.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Maui.Controls
///
/// A button that reacts to touch events.
///
+ [DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
public partial class Button : View, IFontElement, ITextElement, IBorderElement, IButtonController, IElementConfiguration