From 1934d8c9e92d53362d26dab6ff9aabf46b2dae60 Mon Sep 17 00:00:00 2001
From: mhrastegari <mh.rastegari@outlook.com>
Date: Fri, 26 Dec 2025 16:59:57 +0330
Subject: [PATCH 01/11] add HasBorder proprty to Entry

---
 src/Controls/src/Core/Entry/Entry.cs              | 15 +++++++++++++++
 src/Core/src/Core/IEntry.cs                       |  5 +++++
 .../src/Handlers/Entry/EntryHandler.Standard.cs   |  1 +
 src/Core/src/Handlers/Entry/EntryHandler.cs       |  1 +
 4 files changed, 22 insertions(+)

diff --git a/src/Controls/src/Core/Entry/Entry.cs b/src/Controls/src/Core/Entry/Entry.cs
index 9681fd5b8ec7..6fa9911721c5 100644
--- a/src/Controls/src/Core/Entry/Entry.cs
+++ b/src/Controls/src/Core/Entry/Entry.cs
@@ -37,6 +37,11 @@ public partial class Entry : InputView, ITextAlignmentElement, IEntryController,
 		/// </summary>
 		public static readonly BindableProperty IsPasswordProperty = BindableProperty.Create(nameof(IsPassword), typeof(bool), typeof(Entry), default(bool));
 
+		/// <summary>
+		/// Backing store for the <see cref="HasBorder"/> property.
+		/// </summary>
+		public static readonly BindableProperty HasBorderProperty = BindableProperty.Create(nameof(HasBorder), typeof(bool), typeof(Entry), true);
+
 		/// <inheritdoc cref="InputView.TextProperty"/>
 		public new static readonly BindableProperty TextProperty = InputView.TextProperty;
 
@@ -125,6 +130,16 @@ public bool IsPassword
 			set { SetValue(IsPasswordProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets a value that indicating if the Entry has a border displayed. This is a bindable property.
+		/// </summary>
+		public bool HasBorder
+		{
+			get { return (bool)GetValue(HasBorderProperty); }
+			set { SetValue(HasBorderProperty, value); }
+		}
+
+
 		/// <summary>
 		/// Determines what the return key on the on-screen keyboard should look like. This is a bindable property.
 		/// </summary>
diff --git a/src/Core/src/Core/IEntry.cs b/src/Core/src/Core/IEntry.cs
index f66cbaff5978..e4697b5a8076 100644
--- a/src/Core/src/Core/IEntry.cs
+++ b/src/Core/src/Core/IEntry.cs
@@ -10,6 +10,11 @@ public interface IEntry : IView, ITextInput, ITextAlignment
 		/// </summary>
 		bool IsPassword { get; }
 
+		/// <summary>
+		/// Gets a value that indicates if the Entry has a border displayed.
+		/// </summary>
+		bool HasBorder { get; }
+
 		/// <summary>
 		/// Gets an enumeration value that controls the appearance of the return button.
 		/// </summary>
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs b/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
index adf3cb2ab6a4..b6a9b920cf57 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
@@ -9,6 +9,7 @@ public partial class EntryHandler : ViewHandler<IEntry, object>
 		public static void MapText(IEntryHandler handler, IEntry entry) { }
 		public static void MapTextColor(IEntryHandler handler, IEntry entry) { }
 		public static void MapIsPassword(IEntryHandler handler, IEntry entry) { }
+		public static void MapHasBorder(IEntryHandler handler, IEntry entry) { }
 		public static void MapHorizontalTextAlignment(IEntryHandler handler, IEntry entry) { }
 		public static void MapVerticalTextAlignment(IEntryHandler handler, IEntry entry) { }
 
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.cs b/src/Core/src/Handlers/Entry/EntryHandler.cs
index 3d4d666adffc..5552f156c738 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.cs
@@ -24,6 +24,7 @@ public partial class EntryHandler : IEntryHandler
 			[nameof(IEntry.ClearButtonVisibility)] = MapClearButtonVisibility,
 			[nameof(IEntry.Font)] = MapFont,
 			[nameof(IEntry.IsPassword)] = MapIsPassword,
+			[nameof(IEntry.HasBorder)] = MapHasBorder,
 			[nameof(IEntry.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
 			[nameof(IEntry.VerticalTextAlignment)] = MapVerticalTextAlignment,
 			[nameof(IEntry.IsReadOnly)] = MapIsReadOnly,

From 4de500556615aa27f2ce2523ddb9555d77ad5ba7 Mon Sep 17 00:00:00 2001
From: mhrastegari <mh.rastegari@outlook.com>
Date: Fri, 26 Dec 2025 17:00:44 +0330
Subject: [PATCH 02/11] add Android implementation

---
 .../Handlers/Entry/EntryHandler.Android.cs    |  7 ++++++
 .../Platform/Android/EditTextExtensions.cs    | 23 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index 89cf47582001..38768f7c1a6d 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -90,6 +90,13 @@ public static void MapIsPassword(IEntryHandler handler, IEntry entry)
 			handler.PlatformView?.UpdateIsPassword(entry);
 		}
 
+		public static void MapHasBorder(IEntryHandler handler, IEntry entry)
+		{
+			handler.UpdateValue(nameof(IEntry.Text));
+
+			handler.PlatformView?.UpdateHasBorder(entry);
+		}
+
 		public static void MapHorizontalTextAlignment(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateHorizontalTextAlignment(entry);
 
diff --git a/src/Core/src/Platform/Android/EditTextExtensions.cs b/src/Core/src/Platform/Android/EditTextExtensions.cs
index bbb99c029ab4..079509860b35 100644
--- a/src/Core/src/Platform/Android/EditTextExtensions.cs
+++ b/src/Core/src/Platform/Android/EditTextExtensions.cs
@@ -73,6 +73,29 @@ public static void UpdateIsPassword(this EditText editText, IEntry entry)
 			editText.SetInputType(entry);
 		}
 
+		public static void UpdateHasBorder(this EditText editText, IEntry entry)
+		{
+			if (entry.HasBorder)
+			{
+				if (OperatingSystem.IsAndroidVersionAtLeast(23) && editText.Context?.Theme is Resources.Theme theme)
+				{
+					using var typedValue = new TypedValue();
+					if (theme.ResolveAttribute(global::Android.Resource.Attribute.ColorAccent, typedValue, true))
+					{
+						if (editText.Resources?.GetColorStateList(typedValue.ResourceId, theme) is ColorStateList accentColorStateList)
+						{
+							editText.BackgroundTintList = accentColorStateList;
+							return;
+						}
+					}
+				}
+			}
+			else
+			{
+				editText.BackgroundTintList = ColorStateList.ValueOf(Colors.Transparent.ToPlatform());
+			}
+		}
+
 		public static void UpdateHorizontalTextAlignment(this EditText editText, ITextAlignment textAlignment)
 		{
 			editText.UpdateHorizontalAlignment(textAlignment.HorizontalTextAlignment);

From 821fb4d92030fb8961c98459a731ed649741dd7c Mon Sep 17 00:00:00 2001
From: mhrastegari <mh.rastegari@outlook.com>
Date: Fri, 26 Dec 2025 17:01:17 +0330
Subject: [PATCH 03/11] add Windows implementation

---
 .../Handlers/Entry/EntryHandler.Windows.cs    |  3 +++
 .../src/Platform/Windows/TextBoxExtensions.cs | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
index 6b7ec0c2d829..437bade72877 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
@@ -97,6 +97,9 @@ public static void MapClearButtonVisibility(IEntryHandler handler, IEntry entry)
 		public static void MapCharacterSpacing(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateCharacterSpacing(entry);
 
+		public static void MapHasBorder(IEntryHandler handler, IEntry entry) =>
+			handler.PlatformView?.UpdateHasBorder(entry);
+
 		public static void MapKeyboard(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateKeyboard(entry);
 
diff --git a/src/Core/src/Platform/Windows/TextBoxExtensions.cs b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
index a1c8da2dad7e..2eb6c0907b76 100644
--- a/src/Core/src/Platform/Windows/TextBoxExtensions.cs
+++ b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
@@ -50,6 +50,27 @@ public static void UpdateBackground(this TextBox textBox, IView view)
 			"TextControlBackgroundDisabled",
 		};
 
+		public static void UpdateHasBorder(this TextBox textBox, IEntry entry)
+		{
+			if (entry.HasBorder)
+			{
+				textBox.Resources.RemoveKeys(BorderThicknessResourceKeys);
+				textBox.ClearValue(Control.BorderThicknessProperty);
+			}
+			else
+			{
+				textBox.Resources.SetValueForAllKey(BorderThicknessResourceKeys, WinUIHelpers.CreateThickness(0));
+			}
+
+			textBox.RefreshThemeResources();
+		}
+
+		static readonly string[] BorderThicknessResourceKeys =
+		{
+			"TextControlBorderThemeThickness",
+			"TextControlBorderThemeThicknessFocused"
+		};
+
 		public static void UpdateTextColor(this TextBox textBox, ITextStyle textStyle)
 		{
 			var brush = textStyle.TextColor?.ToPlatform();

From 78cf18b7bf4554b7f87dd78e81e928d802e2211d Mon Sep 17 00:00:00 2001
From: mhrastegari <mh.rastegari@outlook.com>
Date: Fri, 26 Dec 2025 17:02:30 +0330
Subject: [PATCH 04/11] add MaciOS implementation

---
 src/Core/src/Handlers/Entry/EntryHandler.iOS.cs  |  3 +++
 src/Core/src/Platform/iOS/TextFieldExtensions.cs | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
index e6e2030716c8..75117d8b8351 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
@@ -105,6 +105,9 @@ public static void MapSelectionLength(IEntryHandler handler, IEntry entry) =>
 		public static void MapClearButtonVisibility(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateClearButtonVisibility(entry);
 
+		public static void MapHasBorder(IEntryHandler handler, IEntry entry) =>
+			handler.PlatformView?.UpdateHasBorder(entry);
+
 		public static void MapFormatting(IEntryHandler handler, IEntry entry)
 		{
 			handler.PlatformView?.UpdateMaxLength(entry);
diff --git a/src/Core/src/Platform/iOS/TextFieldExtensions.cs b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
index 7a501d0d8f83..cb173ca48701 100644
--- a/src/Core/src/Platform/iOS/TextFieldExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
@@ -196,6 +196,18 @@ static UITextPosition GetSelectionEnd(UITextField textField, IEntry entry, UITex
 			return end;
 		}
 
+		public static void UpdateHasBorder(this UITextField textField, IEntry entry)
+		{
+			if (entry.HasBorder)
+			{
+				textField.BorderStyle = UITextBorderStyle.RoundedRect;
+			}
+			else
+			{
+				textField.BorderStyle = UITextBorderStyle.None;
+			}
+		}
+
 		public static void UpdateClearButtonVisibility(this UITextField textField, IEntry entry)
 		{
 			if (entry.ClearButtonVisibility == ClearButtonVisibility.WhileEditing)

From 172e3d1fd9776e29e82e4a9f8afc3e12c414ea70 Mon Sep 17 00:00:00 2001
From: mhrastegari <mh.rastegari@outlook.com>
Date: Fri, 26 Dec 2025 20:49:12 +0330
Subject: [PATCH 05/11] add sample

---
 .../Pages/Controls/EntryPage.xaml             | 74 ++++++++++---------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
index 425a9d45de74..f880a7860a6d 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
@@ -1,10 +1,10 @@
 <views:BasePage
+    x:Class="Maui.Controls.Sample.Pages.EntryPage"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Maui.Controls.Sample.Pages.EntryPage"
     xmlns:controls="clr-namespace:Maui.Controls.Sample.Pages"
-    xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
     xmlns:viewmodels="clr-namespace:Maui.Controls.Sample.ViewModels"
+    xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
     Title="Entry">
     <views:BasePage.Resources>
         <ResourceDictionary>
@@ -15,12 +15,12 @@
                         <VisualStateGroup x:Name="CommonStates">
                             <VisualState x:Name="Normal">
                                 <VisualState.Setters>
-                                    <Setter Property="BackgroundColor" Value="Pink"/>
+                                    <Setter Property="BackgroundColor" Value="Pink" />
                                 </VisualState.Setters>
                             </VisualState>
                             <VisualState x:Name="Focused">
                                 <VisualState.Setters>
-                                    <Setter Property="BackgroundColor" Value="Yellow"/>
+                                    <Setter Property="BackgroundColor" Value="Yellow" />
                                 </VisualState.Setters>
                             </VisualState>
                             <VisualState x:Name="Disabled">
@@ -52,6 +52,12 @@
                     Style="{StaticResource Headline}" />
                 <Entry 
                     IsEnabled="False"/>
+                <Label 
+                    Text="Without Border"
+                    Style="{StaticResource Headline}" />
+                <Entry 
+                    Text="Text"
+                    HasBorder="False" />
                 <Label
                     Text="Using TextColor"
                     Style="{StaticResource Headline}" />
@@ -64,19 +70,19 @@
                 <Entry 
                     ClearButtonVisibility="WhileEditing"
                     Text="Text"
-                    TextColor="Red"/>
+                    TextColor="Red" />
                 <Label
                     Text="With Placeholder"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     x:Name="PlaceholderEntryItem"
-                    Placeholder="Placeholder"/>
+                    Placeholder="Placeholder" />
                 <Label
                     Text="Using PlaceholderColor"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     PlaceholderColor="Purple"
-                    Placeholder="Placeholder"/>
+                    Placeholder="Placeholder" />
                 <Label
                     Text="Password"
                     Style="{StaticResource Headline}" />
@@ -86,7 +92,7 @@
                         IsChecked="true" />
                     <Label 
                         Text="Is Password" 
-                        VerticalOptions="Center"/>
+                        VerticalOptions="Center" />
                 </HorizontalStackLayout>
                 <Entry
                     x:Name="pwdPassword"
@@ -99,53 +105,53 @@
                     Text="With Text"
                     Style="{StaticResource Headline}" />
                 <Entry 
-                    Text="Text"/>
+                    Text="Text" />
                 <Label
                     Text="ClearButtonVisibility = Never"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="Text"
-                    ClearButtonVisibility="Never"/>
+                    ClearButtonVisibility="Never" />
                 <Label
                     Text="ClearButtonVisibility = WhileEditing"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="Text"
-                    ClearButtonVisibility="WhileEditing"/>
+                    ClearButtonVisibility="WhileEditing" />
                 <Label
                     Text="Read-only"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="I am read only" 
-                    IsReadOnly="True"/>
+                    IsReadOnly="True" />
                 <Label
                     Text="SpellCheck (True), TextPrediction (True)" 
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="Whats new" 
                     IsSpellCheckEnabled="True"
-                    IsTextPredictionEnabled="True"/>
+                    IsTextPredictionEnabled="True" />
                 <Label
                     Text="SpellCheck (False), TextPrediction (True)" 
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="Whats new" 
                     IsSpellCheckEnabled="False"
-                    IsTextPredictionEnabled="True"/>
+                    IsTextPredictionEnabled="True" />
                 <Label
                     Text="SpellCheck (True), TextPrediction (False)" 
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="Whats new" 
                     IsSpellCheckEnabled="True"
-                    IsTextPredictionEnabled="False"/>
+                    IsTextPredictionEnabled="False" />
                 <Label
                     Text="SpellCheck (False), TextPrediction (False)" 
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="Whats new" 
                     IsSpellCheckEnabled="False"
-                    IsTextPredictionEnabled="False"/>
+                    IsTextPredictionEnabled="False" />
                 <Label
                     Text="ReturnType (Search)"
                     Style="{StaticResource Headline}" />
@@ -156,47 +162,47 @@
                     Style="{StaticResource Headline}" />
                 <Entry 
                     x:Name="ReturnTypeEntry"
-                    TextChanged="OnReturnTypeEntryTextChanged"/>
+                    TextChanged="OnReturnTypeEntryTextChanged" />
                 <Label
                     Text="Return Command"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     ReturnCommand="{Binding ReturnCommand}"
-                    ReturnCommandParameter="ReturnCommandParameter"/>
+                    ReturnCommandParameter="ReturnCommandParameter" />
                 <Label
                     Text="Focus"
                     Style="{StaticResource Headline}" />
                 <Entry 
-                    Focused="OnEntryFocused"/>
+                    Focused="OnEntryFocused" />
                 <Label
                     Text="Unfocus"
                     Style="{StaticResource Headline}" />
                 <Entry 
-                    Unfocused="OnEntryUnfocused"/>
+                    Unfocused="OnEntryUnfocused" />
                 <Label
                     Text="Completed"
                     Style="{StaticResource Headline}" />
                 <Entry 
-                    Completed="OnEntryCompleted"/>
+                    Completed="OnEntryCompleted" />
                 <Label
                     Text="BackgroundColor"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="BackgroundColor"
-                    BackgroundColor="Orange"/>
+                    BackgroundColor="Orange" />
                 <Label
                    Text="BackgroundColor"
                    Style="{StaticResource Headline}" />
                 <Entry 
-                    x:Name="BackgroundColorEntry"/>
+                    x:Name="BackgroundColorEntry" />
                 <Button
                     x:Name="UpdateBackgroundColorButton"
                     Text="Update Background Color"
-                    Clicked="OnUpdateBackgroundColorButtonClicked"/>
+                    Clicked="OnUpdateBackgroundColorButtonClicked" />
                 <Button
                     x:Name="ClearBackgroundColorButton"
                     Text="Clear Background Color"
-                    Clicked="OnClearBackgroundColorButtonClicked"/>
+                    Clicked="OnClearBackgroundColorButtonClicked" />
                 <Label
                     Text="Background"
                     Style="{StaticResource Headline}" />
@@ -215,15 +221,15 @@
                     Text="Background"
                     Style="{StaticResource Headline}" />
                 <Entry 
-                    x:Name="BackgroundEntry"/>
+                    x:Name="BackgroundEntry" />
                 <Button
                     x:Name="UpdateBackgroundButton"
                     Text="Update Background"
-                    Clicked="OnUpdateBackgroundButtonClicked"/>
+                    Clicked="OnUpdateBackgroundButtonClicked" />
                 <Button
                     x:Name="ClearBackgroundButton"
                     Text="Clear Background"
-                    Clicked="OnClearBackgroundButtonClicked"/>
+                    Clicked="OnClearBackgroundButtonClicked" />
                 <Label
                     Text="Updating Background using VisualStates"
                     Style="{StaticResource Headline}" />
@@ -238,7 +244,7 @@
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="123"
-                    Keyboard="Numeric"/>
+                    Keyboard="Numeric" />
                 <Label
                     Text="HorizontalTextAlignment"
                     Style="{StaticResource Headline}" />
@@ -251,30 +257,30 @@
                 <Entry 
                     VerticalTextAlignment="End"
                     Text="This should be on the bottom"
-                    HeightRequest="100"/>
+                    HeightRequest="100" />
                 <HorizontalStackLayout>
                     <Label
                         x:Name="lblCursor"
                         Text="CursorPosition = 4"
                         Style="{StaticResource Headline}" />
-                    <Slider x:Name="sldCursorPosition" ValueChanged="OnSlideCursorPositionValueChanged" WidthRequest="100"/>
+                    <Slider x:Name="sldCursorPosition" ValueChanged="OnSlideCursorPositionValueChanged" WidthRequest="100" />
                 </HorizontalStackLayout>
                 <Entry
                     x:Name="entryCursor"
                     Text="Cursor"
-                    CursorPosition="4"/>
+                    CursorPosition="4" />
                 <HorizontalStackLayout>
                     <Label
                     x:Name="lblSelection"
                     Text="SelectionLength = 4"
                     Style="{StaticResource Headline}" />
-                    <Slider x:Name="sldSelection" ValueChanged="OnSlideSelectionValueChanged" WidthRequest="100"/>
+                    <Slider x:Name="sldSelection" ValueChanged="OnSlideSelectionValueChanged" WidthRequest="100" />
                 </HorizontalStackLayout>
                 <Entry
                     x:Name="entrySelection"
                     Text="Selection"
                     CursorPosition="2"
-                    SelectionLength="4"/>
+                    SelectionLength="4" />
                 <Label
                     Text="Platform Specific (Search ImeOptions)"
                     Style="{StaticResource Headline}" />

From d590c8caba278abd5564f8ab82d4e920db369882 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Rastegarinia <mh.rastegari@outlook.com>
Date: Tue, 30 Dec 2025 14:37:36 +0000
Subject: [PATCH 06/11] add missing PublicAPI entries

---
 .../src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt     | 3 +++
 .../src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt         | 3 +++
 .../src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt | 3 +++
 .../src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt     | 3 +++
 src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt    | 3 +++
 .../src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt     | 3 +++
 src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt     | 3 +++
 src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt         | 3 +++
 src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt | 3 +++
 src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt     | 3 +++
 src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt             | 2 ++
 src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt     | 2 ++
 src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt  | 2 ++
 13 files changed, 36 insertions(+)

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 7dc5c58110bf..a68935f42839 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
+Microsoft.Maui.Controls.Entry.HasBorder.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 7d0110928035..e3b1f85d3e63 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
+Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
+Microsoft.Maui.Controls.Entry.HasBorder.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
 ~override Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutRenderer.ViewWillTransitionToSize(CoreGraphics.CGSize toSize, UIKit.IUIViewControllerTransitionCoordinator coordinator) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 7d0110928035..e3b1f85d3e63 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
+Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
+Microsoft.Maui.Controls.Entry.HasBorder.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
 ~override Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutRenderer.ViewWillTransitionToSize(CoreGraphics.CGSize toSize, UIKit.IUIViewControllerTransitionCoordinator coordinator) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 7dc5c58110bf..a68935f42839 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
+Microsoft.Maui.Controls.Entry.HasBorder.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 7dc5c58110bf..a68935f42839 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
+Microsoft.Maui.Controls.Entry.HasBorder.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 7dc5c58110bf..a68935f42839 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
+Microsoft.Maui.Controls.Entry.HasBorder.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 7dc5c58110bf..866219d7b742 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.IEntry.HasBorder.get -> bool
+static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.EditTextExtensions.UpdateHasBorder(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ebd197b91951..6e20a4b01d34 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
+Microsoft.Maui.IEntry.HasBorder.get -> bool
+static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextFieldExtensions.UpdateHasBorder(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
 override Microsoft.Maui.Platform.MauiView.DidUpdateFocus(UIKit.UIFocusUpdateContext! context, UIKit.UIFocusAnimationCoordinator! coordinator) -> void
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index ebd197b91951..6e20a4b01d34 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
+Microsoft.Maui.IEntry.HasBorder.get -> bool
+static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextFieldExtensions.UpdateHasBorder(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
 override Microsoft.Maui.Platform.MauiView.DidUpdateFocus(UIKit.UIFocusUpdateContext! context, UIKit.UIFocusAnimationCoordinator! coordinator) -> void
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 7dc5c58110bf..91edb9de7f3c 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.IEntry.HasBorder.get -> bool
+static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextBoxExtensions.UpdateHasBorder(this Microsoft.UI.Xaml.Controls.TextBox! textBox, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 7dc5c58110bf..92c50c4403a1 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+Microsoft.Maui.IEntry.HasBorder.get -> bool
+static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 7dc5c58110bf..92c50c4403a1 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+Microsoft.Maui.IEntry.HasBorder.get -> bool
+static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 7dc5c58110bf..92c50c4403a1 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+Microsoft.Maui.IEntry.HasBorder.get -> bool
+static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void

From c64bc839a3d20bd41da28673f68fafcd27c6e0e6 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Rastegarinia <mh.rastegari@outlook.com>
Date: Fri, 2 Jan 2026 19:47:59 +0000
Subject: [PATCH 07/11] add missing tests

---
 .../Entry/EntryHandlerTests.Android.cs        |  14 ++
 .../Entry/EntryHandlerTests.Windows.cs        |   9 ++
 .../Handlers/Entry/EntryHandlerTests.cs       | 124 ++++++++++++++++++
 .../Handlers/Entry/EntryHandlerTests.iOS.cs   |   7 +
 src/Core/tests/DeviceTests/Stubs/EntryStub.cs |   2 +
 5 files changed, 156 insertions(+)

diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
index 7fdaf8262f78..4e0758f86c0d 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
@@ -348,6 +348,20 @@ bool GetNativeClearButtonVisibility(EntryHandler entryHandler)
 			return compoundsValidWhenFocused && compoundsValidWhenUnfocused;
 		}
 
+		bool GetNativeHasBorder(EntryHandler entryHandler)
+		{
+			var editText = GetNativeEntry(entryHandler);
+
+			var tintList = editText.BackgroundTintList;
+			if (tintList is null)
+				return true;
+
+			var defaultColor = tintList.DefaultColor;
+			var transparentColor = Colors.Transparent.ToPlatform();
+
+			return defaultColor != transparentColor;
+		}
+
 		[Fact(DisplayName = "CharacterSpacing Initializes Correctly")]
 		public async Task CharacterSpacingInitializesCorrectly()
 		{
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
index 660fb329dccb..6275464831a6 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
@@ -156,6 +156,15 @@ bool GetNativeIsChatKeyboard(EntryHandler entryHandler) =>
 
 		bool GetNativeClearButtonVisibility(EntryHandler entryHandler) =>
 			GetNativeEntry(entryHandler).GetClearButtonVisibility();
+			
+		bool GetNativeHasBorder(EntryHandler entryHandler)
+		{
+			var textBox = GetNativeEntry(entryHandler);
+
+			var borderThickness = textBox.BorderThickness;
+			return borderThickness.Top != 0 || borderThickness.Left != 0 ||
+				   borderThickness.Right != 0 || borderThickness.Bottom != 0;
+		}
 
 		NativeTextAlignment GetNativeHorizontalTextAlignment(EntryHandler entryHandler) =>
 			GetNativeEntry(entryHandler).TextAlignment;
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
index dd6324880389..a8eac2cf9300 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
@@ -675,6 +675,130 @@ public async Task VerticalTextAlignmentInitializesCorrectly(TextAlignment textAl
 			Assert.Equal(platformAlignment, values.PlatformViewValue);
 		}
 
+		[Theory(DisplayName = "HasBorder Initializes Correctly")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task HasBorderInitializesCorrectly(bool hasBorder)
+		{
+			var entry = new EntryStub()
+			{
+				HasBorder = hasBorder
+			};
+
+			await ValidatePropertyInitValue(entry, () => entry.HasBorder, GetNativeHasBorder, hasBorder);
+		}
+
+		[Theory(DisplayName = "HasBorder Updates Correctly")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task HasBorderUpdatesCorrectly(bool setValue, bool unsetValue)
+		{
+			var entry = new EntryStub();
+
+			await ValidatePropertyUpdatesValue(
+				entry,
+				nameof(IEntry.HasBorder),
+				GetNativeHasBorder,
+				setValue,
+				unsetValue);
+		}
+
+		[Theory(DisplayName = "Updating HasBorder Does Not Affect Text")]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		public async Task HasBorderDoesNotAffectText(bool initialHasBorder, bool newHasBorder)
+		{
+			var entry = new EntryStub
+			{
+				Text = "Test Text",
+				HasBorder = initialHasBorder
+			};
+
+			await ValidateUnrelatedPropertyUnaffected(
+				entry,
+				GetNativeText,
+				nameof(IEntry.HasBorder),
+				() => entry.HasBorder = newHasBorder);
+		}
+
+		[Theory(DisplayName = "Updating HasBorder Does Not Affect TextColor")]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		public async Task HasBorderDoesNotAffectTextColor(bool initialHasBorder, bool newHasBorder)
+		{
+			var entry = new EntryStub
+			{
+				Text = "Test",
+				TextColor = Colors.Red,
+				HasBorder = initialHasBorder
+			};
+
+			await ValidateUnrelatedPropertyUnaffected(
+				entry,
+				GetNativeTextColor,
+				nameof(IEntry.HasBorder),
+				() => entry.HasBorder = newHasBorder);
+		}
+
+		[Theory(DisplayName = "Updating HasBorder Does Not Affect Placeholder")]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		public async Task HasBorderDoesNotAffectPlaceholder(bool initialHasBorder, bool newHasBorder)
+		{
+			var entry = new EntryStub
+			{
+				Placeholder = "Enter text",
+				HasBorder = initialHasBorder
+			};
+
+			await ValidateUnrelatedPropertyUnaffected(
+				entry,
+				GetNativePlaceholder,
+				nameof(IEntry.HasBorder),
+				() => entry.HasBorder = newHasBorder);
+		}
+
+		[Theory(DisplayName = "Updating Text Does Not Affect HasBorder")]
+		[InlineData("Short", "Longer Text")]
+		[InlineData("Long text here", "Short")]
+		public async Task TextDoesNotAffectHasBorder(string initialText, string newText)
+		{
+			var entry = new EntryStub
+			{
+				Text = initialText,
+				HasBorder = true
+			};
+
+			await ValidateUnrelatedPropertyUnaffected(
+				entry,
+				GetNativeHasBorder,
+				nameof(IEntry.Text),
+				() => entry.Text = newText);
+		}
+
+		[Theory(DisplayName = "Updating TextColor Does Not Affect HasBorder")]
+		[InlineData(0xFFFF0000, 0xFF0000FF)]
+		[InlineData(0xFF0000FF, 0xFFFF0000)]
+		public async Task TextColorDoesNotAffectHasBorder(uint setValue, uint unsetValue)
+		{
+			var entry = new EntryStub
+			{
+				Text = "Test",
+				HasBorder = true
+			};
+
+			var setColor = Color.FromUint(setValue);
+			var unsetColor = Color.FromUint(unsetValue);
+
+			await ValidateUnrelatedPropertyUnaffected(
+				entry,
+				GetNativeHasBorder,
+				nameof(IEntry.TextColor),
+				() => entry.TextColor = setColor);
+		}
+
 		[Category(TestCategory.Entry)]
 		public class EntryTextStyleTests : TextStyleHandlerTests<EntryHandler, EntryStub>
 		{
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
index 753c158cb38b..094cbcfb304e 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
@@ -863,5 +863,12 @@ int GetNativeSelectionLength(EntryHandler entryHandler)
 
 			return -1;
 		}
+		
+		bool GetNativeHasBorder(EntryHandler entryHandler)
+		{
+			var textField = GetNativeEntry(entryHandler);
+
+			return textField.BorderStyle == UITextBorderStyle.RoundedRect;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
index 41154a48d0c8..2f35184e486b 100644
--- a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
@@ -29,6 +29,8 @@ public string Text
 
 		public bool IsReadOnly { get; set; }
 
+		public bool HasBorder { get; set; } = true;
+
 		public Font Font { get; set; }
 
 		public int MaxLength { get; set; } = int.MaxValue;

From fde1ac7bd1426c3afbba0ba313787ee6c705e37b Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Rastegarinia <mh.rastegari@outlook.com>
Date: Sun, 4 Jan 2026 17:18:48 +0000
Subject: [PATCH 08/11] resolve review comments

---
 .../Handlers/Entry/EntryHandlerTests.cs       | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
index a8eac2cf9300..4098f2b9b5fb 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
@@ -799,6 +799,74 @@ await ValidateUnrelatedPropertyUnaffected(
 				() => entry.TextColor = setColor);
 		}
 
+		[Theory(DisplayName = "HasBorder Works Correctly with Background")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task HasBorderWorksCorrectlyWithBackground(bool hasBorder)
+		{
+			var entry = new EntryStub
+			{
+				Text = "Test",
+				HasBorder = hasBorder,
+				Background = new SolidPaintStub(Colors.Red)
+			};
+
+			await AttachAndRun(entry, async (handler) =>
+			{
+				await AssertEventually(() => handler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyInitValue(entry, () => entry.HasBorder, GetNativeHasBorder, hasBorder);
+
+			var hasBackground = await GetValueAsync(entry, handler =>
+			{
+				return handler.PlatformView != null;
+			});
+
+			Assert.True(hasBackground);
+		}
+
+		[Theory(DisplayName = "Updating Background Does Not Affect HasBorder")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task BackgroundDoesNotAffectHasBorder(bool hasBorder)
+		{
+			var entry = new EntryStub
+			{
+				Text = "Test",
+				HasBorder = hasBorder,
+				Background = new SolidPaintStub(Colors.Yellow)
+			};
+
+			await ValidateUnrelatedPropertyUnaffected(
+				entry,
+				GetNativeHasBorder,
+				nameof(IEntry.Background),
+				() => entry.Background = new SolidPaintStub(Colors.Red));
+		}
+
+		[Theory(DisplayName = "Updating HasBorder Does Not Affect Background")]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		public async Task HasBorderDoesNotAffectBackground(bool initialHasBorder, bool newHasBorder)
+		{
+			var entry = new EntryStub
+			{
+				Text = "Test",
+				HasBorder = initialHasBorder,
+				Background = new SolidPaintStub(Colors.Blue)
+			};
+			
+			await AttachAndRun(entry, async (handler) =>
+			{
+				await AssertEventually(() => handler.PlatformView.IsLoaded());
+				
+				entry.HasBorder = newHasBorder;
+
+				Assert.NotNull(handler.PlatformView);
+			});
+		}
+
 		[Category(TestCategory.Entry)]
 		public class EntryTextStyleTests : TextStyleHandlerTests<EntryHandler, EntryStub>
 		{

From d03450792a374939cc3d4b007b4f75fa92e36ac6 Mon Sep 17 00:00:00 2001
From: mhrastegari <mh.rastegari@outlook.com>
Date: Wed, 28 Jan 2026 22:17:14 +0330
Subject: [PATCH 09/11] replace HasBorder with BorderStyle

---
 .../Pages/Controls/EntryPage.xaml             |  30 +++--
 src/Controls/src/Core/Entry/Entry.cs          |  13 +-
 .../net-android/PublicAPI.Unshipped.txt       |   8 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   6 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   6 +-
 .../net-tizen/PublicAPI.Unshipped.txt         |   3 +
 .../net-windows/PublicAPI.Unshipped.txt       |   8 +-
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |   8 +-
 .../netstandard/PublicAPI.Unshipped.txt       |   6 +-
 src/Core/src/Core/IEntry.cs                   |   4 +-
 .../Handlers/Entry/EntryHandler.Android.cs    |   6 +-
 .../Handlers/Entry/EntryHandler.Windows.cs    |   4 +-
 src/Core/src/Handlers/Entry/EntryHandler.cs   |   2 +-
 .../src/Handlers/Entry/EntryHandler.iOS.cs    |   4 +-
 .../Platform/Android/EditTextExtensions.cs    |   4 +-
 .../src/Platform/Windows/TextBoxExtensions.cs |   4 +-
 .../src/Platform/iOS/TextFieldExtensions.cs   |   4 +-
 src/Core/src/Primitives/BorderStyle.cs        |  18 +++
 .../net-android/PublicAPI.Unshipped.txt       |  11 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  11 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  11 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  11 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |   9 +-
 .../netstandard/PublicAPI.Unshipped.txt       |   9 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   9 +-
 .../Entry/EntryHandlerTests.Android.cs        |   6 +-
 .../Entry/EntryHandlerTests.Windows.cs        |   9 +-
 .../Handlers/Entry/EntryHandlerTests.cs       | 126 +++++++++---------
 .../Handlers/Entry/EntryHandlerTests.iOS.cs   |   6 +-
 src/Core/tests/DeviceTests/Stubs/EntryStub.cs |   2 +-
 30 files changed, 202 insertions(+), 156 deletions(-)
 create mode 100644 src/Core/src/Primitives/BorderStyle.cs

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
index f880a7860a6d..8bccacb03090 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
@@ -43,27 +43,31 @@
             <VerticalStackLayout Padding="12">
                 <Button Margin="5" x:Name="ShowSoftInputAsyncButton" Clicked="ShowSoftInputAsyncButton_Clicked" Text="Show Soft Input for Placeholder Button" />
                 <Button Margin="5" x:Name="HideSoftInputAsyncButton" Clicked="HideSoftInputAsyncButton_Clicked" Text="Hide Soft Input" />
-                <Label
-                    Text="Basic"
-                    Style="{StaticResource Headline}" />
-                <Entry />
+                <VerticalStackLayout Spacing="4">
+                    <Label
+                        Text="Basic"
+                        Style="{StaticResource Headline}" />
+                    <Entry />
+                </VerticalStackLayout>
+                <VerticalStackLayout Spacing="4">
+                    <Label
+                        Text="Without Border"
+                        Style="{StaticResource Headline}" />
+                    <Entry 
+                        Text="Text"
+                        BorderStyle="None" />
+                </VerticalStackLayout>
                 <Label
                     Text="Disabled"
                     Style="{StaticResource Headline}" />
-                <Entry 
-                    IsEnabled="False"/>
-                <Label 
-                    Text="Without Border"
-                    Style="{StaticResource Headline}" />
-                <Entry 
-                    Text="Text"
-                    HasBorder="False" />
+                <Entry
+                    IsEnabled="False" />
                 <Label
                     Text="Using TextColor"
                     Style="{StaticResource Headline}" />
                 <Entry 
                     Text="Text"
-                    TextColor="Purple"/>
+                    TextColor="Purple" />
                 <Label
                     Text="Using TextColor (for the text color and the clear button color)"
                     Style="{StaticResource Headline}" />
diff --git a/src/Controls/src/Core/Entry/Entry.cs b/src/Controls/src/Core/Entry/Entry.cs
index 6fa9911721c5..4ecf285d7646 100644
--- a/src/Controls/src/Core/Entry/Entry.cs
+++ b/src/Controls/src/Core/Entry/Entry.cs
@@ -38,9 +38,9 @@ public partial class Entry : InputView, ITextAlignmentElement, IEntryController,
 		public static readonly BindableProperty IsPasswordProperty = BindableProperty.Create(nameof(IsPassword), typeof(bool), typeof(Entry), default(bool));
 
 		/// <summary>
-		/// Backing store for the <see cref="HasBorder"/> property.
+		/// Backing store for the <see cref="BorderStyle"/> property.
 		/// </summary>
-		public static readonly BindableProperty HasBorderProperty = BindableProperty.Create(nameof(HasBorder), typeof(bool), typeof(Entry), true);
+		public static readonly BindableProperty BorderStyleProperty = BindableProperty.Create(nameof(BorderStyle), typeof(BorderStyle), typeof(Entry), BorderStyle.Default);
 
 		/// <inheritdoc cref="InputView.TextProperty"/>
 		public new static readonly BindableProperty TextProperty = InputView.TextProperty;
@@ -131,15 +131,14 @@ public bool IsPassword
 		}
 
 		/// <summary>
-		/// Gets or sets a value that indicating if the Entry has a border displayed. This is a bindable property.
+		/// Gets or sets the border style of the Entry. This is a bindable property.
 		/// </summary>
-		public bool HasBorder
+		public BorderStyle BorderStyle
 		{
-			get { return (bool)GetValue(HasBorderProperty); }
-			set { SetValue(HasBorderProperty, value); }
+			get { return (BorderStyle)GetValue(BorderStyleProperty); }
+			set { SetValue(BorderStyleProperty, value); }
 		}
 
-
 		/// <summary>
 		/// Determines what the return key on the on-screen keyboard should look like. This is a bindable property.
 		/// </summary>
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index a68935f42839..bbef99c581ee 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,4 @@
-#nullable enable
-Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
-Microsoft.Maui.Controls.Entry.HasBorder.set -> void
-~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
+#nullable enable
+Microsoft.Maui.Controls.Entry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.Controls.Entry.BorderStyle.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.BorderStyleProperty -> Microsoft.Maui.Controls.BindableProperty
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index e3b1f85d3e63..84345f335895 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,5 +1,5 @@
 #nullable enable
-Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
-Microsoft.Maui.Controls.Entry.HasBorder.set -> void
-~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
+Microsoft.Maui.Controls.Entry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.Controls.Entry.BorderStyle.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.BorderStyleProperty -> Microsoft.Maui.Controls.BindableProperty
 ~override Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutRenderer.ViewWillTransitionToSize(CoreGraphics.CGSize toSize, UIKit.IUIViewControllerTransitionCoordinator coordinator) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index e3b1f85d3e63..84345f335895 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,5 +1,5 @@
 #nullable enable
-Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
-Microsoft.Maui.Controls.Entry.HasBorder.set -> void
-~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
+Microsoft.Maui.Controls.Entry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.Controls.Entry.BorderStyle.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.BorderStyleProperty -> Microsoft.Maui.Controls.BindableProperty
 ~override Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutRenderer.ViewWillTransitionToSize(CoreGraphics.CGSize toSize, UIKit.IUIViewControllerTransitionCoordinator coordinator) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 7dc5c58110bf..c48be5fa569a 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
+Microsoft.Maui.Controls.Entry.HasBorder.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index a68935f42839..bbef99c581ee 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,4 +1,4 @@
-#nullable enable
-Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
-Microsoft.Maui.Controls.Entry.HasBorder.set -> void
-~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
+#nullable enable
+Microsoft.Maui.Controls.Entry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.Controls.Entry.BorderStyle.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.BorderStyleProperty -> Microsoft.Maui.Controls.BindableProperty
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index a68935f42839..bbef99c581ee 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,4 +1,4 @@
-#nullable enable
-Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
-Microsoft.Maui.Controls.Entry.HasBorder.set -> void
-~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
+#nullable enable
+Microsoft.Maui.Controls.Entry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.Controls.Entry.BorderStyle.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.BorderStyleProperty -> Microsoft.Maui.Controls.BindableProperty
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index a68935f42839..266e24428498 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,4 +1,4 @@
 #nullable enable
-Microsoft.Maui.Controls.Entry.HasBorder.get -> bool
-Microsoft.Maui.Controls.Entry.HasBorder.set -> void
-~static readonly Microsoft.Maui.Controls.Entry.HasBorderProperty -> Microsoft.Maui.Controls.BindableProperty
+Microsoft.Maui.Controls.Entry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.Controls.Entry.BorderStyle.set -> void
+~static readonly Microsoft.Maui.Controls.Entry.BorderStyleProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Core/src/Core/IEntry.cs b/src/Core/src/Core/IEntry.cs
index e4697b5a8076..9afe224ad948 100644
--- a/src/Core/src/Core/IEntry.cs
+++ b/src/Core/src/Core/IEntry.cs
@@ -11,9 +11,9 @@ public interface IEntry : IView, ITextInput, ITextAlignment
 		bool IsPassword { get; }
 
 		/// <summary>
-		/// Gets a value that indicates if the Entry has a border displayed.
+		/// Gets a value that controls the border style of the Entry.
 		/// </summary>
-		bool HasBorder { get; }
+		BorderStyle BorderStyle { get; }
 
 		/// <summary>
 		/// Gets an enumeration value that controls the appearance of the return button.
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index 38768f7c1a6d..a2141ad3646b 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -89,12 +89,12 @@ public static void MapIsPassword(IEntryHandler handler, IEntry entry)
 
 			handler.PlatformView?.UpdateIsPassword(entry);
 		}
-
-		public static void MapHasBorder(IEntryHandler handler, IEntry entry)
+		
+		public static void MapBorderStyle(IEntryHandler handler, IEntry entry)
 		{
 			handler.UpdateValue(nameof(IEntry.Text));
 
-			handler.PlatformView?.UpdateHasBorder(entry);
+			handler.PlatformView?.UpdateBorderStyle(entry);
 		}
 
 		public static void MapHorizontalTextAlignment(IEntryHandler handler, IEntry entry) =>
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
index 437bade72877..170db1d8d128 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
@@ -97,8 +97,8 @@ public static void MapClearButtonVisibility(IEntryHandler handler, IEntry entry)
 		public static void MapCharacterSpacing(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateCharacterSpacing(entry);
 
-		public static void MapHasBorder(IEntryHandler handler, IEntry entry) =>
-			handler.PlatformView?.UpdateHasBorder(entry);
+		public static void MapBorderStyle(IEntryHandler handler, IEntry entry) =>
+			handler.PlatformView?.UpdateBorderStyle(entry);
 
 		public static void MapKeyboard(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateKeyboard(entry);
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.cs b/src/Core/src/Handlers/Entry/EntryHandler.cs
index 5552f156c738..485f192f579a 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.cs
@@ -24,7 +24,7 @@ public partial class EntryHandler : IEntryHandler
 			[nameof(IEntry.ClearButtonVisibility)] = MapClearButtonVisibility,
 			[nameof(IEntry.Font)] = MapFont,
 			[nameof(IEntry.IsPassword)] = MapIsPassword,
-			[nameof(IEntry.HasBorder)] = MapHasBorder,
+			[nameof(IEntry.BorderStyle)] = MapBorderStyle,
 			[nameof(IEntry.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
 			[nameof(IEntry.VerticalTextAlignment)] = MapVerticalTextAlignment,
 			[nameof(IEntry.IsReadOnly)] = MapIsReadOnly,
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
index 75117d8b8351..83aadc51951d 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
@@ -105,8 +105,8 @@ public static void MapSelectionLength(IEntryHandler handler, IEntry entry) =>
 		public static void MapClearButtonVisibility(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateClearButtonVisibility(entry);
 
-		public static void MapHasBorder(IEntryHandler handler, IEntry entry) =>
-			handler.PlatformView?.UpdateHasBorder(entry);
+		public static void MapBorderStyle(IEntryHandler handler, IEntry entry) =>
+			handler.PlatformView?.UpdateBorderStyle(entry);
 
 		public static void MapFormatting(IEntryHandler handler, IEntry entry)
 		{
diff --git a/src/Core/src/Platform/Android/EditTextExtensions.cs b/src/Core/src/Platform/Android/EditTextExtensions.cs
index 079509860b35..2f53a18c4dc5 100644
--- a/src/Core/src/Platform/Android/EditTextExtensions.cs
+++ b/src/Core/src/Platform/Android/EditTextExtensions.cs
@@ -73,9 +73,9 @@ public static void UpdateIsPassword(this EditText editText, IEntry entry)
 			editText.SetInputType(entry);
 		}
 
-		public static void UpdateHasBorder(this EditText editText, IEntry entry)
+		public static void UpdateBorderStyle(this EditText editText, IEntry entry)
 		{
-			if (entry.HasBorder)
+			if (entry.BorderStyle is BorderStyle.Default)
 			{
 				if (OperatingSystem.IsAndroidVersionAtLeast(23) && editText.Context?.Theme is Resources.Theme theme)
 				{
diff --git a/src/Core/src/Platform/Windows/TextBoxExtensions.cs b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
index 2eb6c0907b76..c1f8296ba306 100644
--- a/src/Core/src/Platform/Windows/TextBoxExtensions.cs
+++ b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
@@ -50,9 +50,9 @@ public static void UpdateBackground(this TextBox textBox, IView view)
 			"TextControlBackgroundDisabled",
 		};
 
-		public static void UpdateHasBorder(this TextBox textBox, IEntry entry)
+		public static void UpdateBorderStyle(this TextBox textBox, IEntry entry)
 		{
-			if (entry.HasBorder)
+			if (entry.BorderStyle is BorderStyle.Default)
 			{
 				textBox.Resources.RemoveKeys(BorderThicknessResourceKeys);
 				textBox.ClearValue(Control.BorderThicknessProperty);
diff --git a/src/Core/src/Platform/iOS/TextFieldExtensions.cs b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
index cb173ca48701..8b315d2dcd3e 100644
--- a/src/Core/src/Platform/iOS/TextFieldExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
@@ -196,9 +196,9 @@ static UITextPosition GetSelectionEnd(UITextField textField, IEntry entry, UITex
 			return end;
 		}
 
-		public static void UpdateHasBorder(this UITextField textField, IEntry entry)
+		public static void UpdateBorderStyle(this UITextField textField, IEntry entry)
 		{
-			if (entry.HasBorder)
+			if (entry.BorderStyle is BorderStyle.Default)
 			{
 				textField.BorderStyle = UITextBorderStyle.RoundedRect;
 			}
diff --git a/src/Core/src/Primitives/BorderStyle.cs b/src/Core/src/Primitives/BorderStyle.cs
new file mode 100644
index 000000000000..7117f55bb21b
--- /dev/null
+++ b/src/Core/src/Primitives/BorderStyle.cs
@@ -0,0 +1,18 @@
+namespace Microsoft.Maui
+{
+    /// <summary>
+    /// Enumerates values that control the border style of an Entry control.
+    /// </summary>
+    public enum BorderStyle
+    {
+        /// <summary>
+        /// Shows the platform's default border/decoration style.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// Hides the border/decoration (borderless style).
+        /// </summary>
+        None
+    }
+}
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 866219d7b742..1c0c3f3b75d1 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
-#nullable enable
-Microsoft.Maui.IEntry.HasBorder.get -> bool
-static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
-static Microsoft.Maui.Platform.EditTextExtensions.UpdateHasBorder(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry) -> void
+#nullable enable
+Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.Default = 0 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.None = 1 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.IEntry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+static Microsoft.Maui.Handlers.EntryHandler.MapBorderStyle(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.EditTextExtensions.UpdateBorderStyle(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 6e20a4b01d34..548fbe8d8dbf 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,5 +1,8 @@
-#nullable enable
-Microsoft.Maui.IEntry.HasBorder.get -> bool
-static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
-static Microsoft.Maui.Platform.TextFieldExtensions.UpdateHasBorder(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
+#nullable enable
+Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.Default = 0 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.None = 1 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.IEntry.BorderStyle.get -> Microsoft.Maui.BorderStyle
 override Microsoft.Maui.Platform.MauiView.DidUpdateFocus(UIKit.UIFocusUpdateContext! context, UIKit.UIFocusAnimationCoordinator! coordinator) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapBorderStyle(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextFieldExtensions.UpdateBorderStyle(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 6e20a4b01d34..548fbe8d8dbf 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,5 +1,8 @@
-#nullable enable
-Microsoft.Maui.IEntry.HasBorder.get -> bool
-static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
-static Microsoft.Maui.Platform.TextFieldExtensions.UpdateHasBorder(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
+#nullable enable
+Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.Default = 0 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.None = 1 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.IEntry.BorderStyle.get -> Microsoft.Maui.BorderStyle
 override Microsoft.Maui.Platform.MauiView.DidUpdateFocus(UIKit.UIFocusUpdateContext! context, UIKit.UIFocusAnimationCoordinator! coordinator) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapBorderStyle(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextFieldExtensions.UpdateBorderStyle(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 91edb9de7f3c..8f619c1b0390 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
-#nullable enable
-Microsoft.Maui.IEntry.HasBorder.get -> bool
-static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
-static Microsoft.Maui.Platform.TextBoxExtensions.UpdateHasBorder(this Microsoft.UI.Xaml.Controls.TextBox! textBox, Microsoft.Maui.IEntry! entry) -> void
+#nullable enable
+Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.Default = 0 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.None = 1 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.IEntry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+static Microsoft.Maui.Handlers.EntryHandler.MapBorderStyle(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextBoxExtensions.UpdateBorderStyle(this Microsoft.UI.Xaml.Controls.TextBox! textBox, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 92c50c4403a1..b47f3fba7be1 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,3 +1,6 @@
-#nullable enable
-Microsoft.Maui.IEntry.HasBorder.get -> bool
-static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+#nullable enable
+Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.Default = 0 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.None = 1 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.IEntry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+static Microsoft.Maui.Handlers.EntryHandler.MapBorderStyle(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 92c50c4403a1..b47f3fba7be1 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,3 +1,6 @@
-#nullable enable
-Microsoft.Maui.IEntry.HasBorder.get -> bool
-static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+#nullable enable
+Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.Default = 0 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.None = 1 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.IEntry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+static Microsoft.Maui.Handlers.EntryHandler.MapBorderStyle(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 92c50c4403a1..b47f3fba7be1 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,3 +1,6 @@
-#nullable enable
-Microsoft.Maui.IEntry.HasBorder.get -> bool
-static Microsoft.Maui.Handlers.EntryHandler.MapHasBorder(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+#nullable enable
+Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.Default = 0 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.BorderStyle.None = 1 -> Microsoft.Maui.BorderStyle
+Microsoft.Maui.IEntry.BorderStyle.get -> Microsoft.Maui.BorderStyle
+static Microsoft.Maui.Handlers.EntryHandler.MapBorderStyle(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
index 4e0758f86c0d..39a0bfd00502 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
@@ -348,18 +348,18 @@ bool GetNativeClearButtonVisibility(EntryHandler entryHandler)
 			return compoundsValidWhenFocused && compoundsValidWhenUnfocused;
 		}
 
-		bool GetNativeHasBorder(EntryHandler entryHandler)
+		BorderStyle GetNativeBorderStyle(EntryHandler entryHandler)
 		{
 			var editText = GetNativeEntry(entryHandler);
 
 			var tintList = editText.BackgroundTintList;
 			if (tintList is null)
-				return true;
+				return BorderStyle.Default;
 
 			var defaultColor = tintList.DefaultColor;
 			var transparentColor = Colors.Transparent.ToPlatform();
 
-			return defaultColor != transparentColor;
+			return defaultColor != transparentColor ? BorderStyle.Default : BorderStyle.None;
 		}
 
 		[Fact(DisplayName = "CharacterSpacing Initializes Correctly")]
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
index 6275464831a6..cbd9523f4752 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
@@ -156,14 +156,15 @@ bool GetNativeIsChatKeyboard(EntryHandler entryHandler) =>
 
 		bool GetNativeClearButtonVisibility(EntryHandler entryHandler) =>
 			GetNativeEntry(entryHandler).GetClearButtonVisibility();
-			
-		bool GetNativeHasBorder(EntryHandler entryHandler)
+
+		BorderStyle GetNativeBorderStyle(EntryHandler entryHandler)
 		{
 			var textBox = GetNativeEntry(entryHandler);
 
 			var borderThickness = textBox.BorderThickness;
-			return borderThickness.Top != 0 || borderThickness.Left != 0 ||
-				   borderThickness.Right != 0 || borderThickness.Bottom != 0;
+			var hasBorder = borderThickness.Top != 0 || borderThickness.Left != 0 ||
+							borderThickness.Right != 0 || borderThickness.Bottom != 0;
+			return hasBorder ? BorderStyle.Default : BorderStyle.None;
 		}
 
 		NativeTextAlignment GetNativeHorizontalTextAlignment(EntryHandler entryHandler) =>
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
index 4098f2b9b5fb..b8dbbf333c8d 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
@@ -675,118 +675,118 @@ public async Task VerticalTextAlignmentInitializesCorrectly(TextAlignment textAl
 			Assert.Equal(platformAlignment, values.PlatformViewValue);
 		}
 
-		[Theory(DisplayName = "HasBorder Initializes Correctly")]
-		[InlineData(true)]
-		[InlineData(false)]
-		public async Task HasBorderInitializesCorrectly(bool hasBorder)
+		[Theory(DisplayName = "BorderStyle Initializes Correctly")]
+		[InlineData(BorderStyle.Default)]
+		[InlineData(BorderStyle.None)]
+		public async Task BorderStyleInitializesCorrectly(BorderStyle borderStyle)
 		{
 			var entry = new EntryStub()
 			{
-				HasBorder = hasBorder
+				BorderStyle = borderStyle
 			};
 
-			await ValidatePropertyInitValue(entry, () => entry.HasBorder, GetNativeHasBorder, hasBorder);
+			await ValidatePropertyInitValue(entry, () => entry.BorderStyle, GetNativeBorderStyle, borderStyle);
 		}
 
-		[Theory(DisplayName = "HasBorder Updates Correctly")]
-		[InlineData(true, true)]
-		[InlineData(true, false)]
-		[InlineData(false, true)]
-		[InlineData(false, false)]
-		public async Task HasBorderUpdatesCorrectly(bool setValue, bool unsetValue)
+		[Theory(DisplayName = "BorderStyle Updates Correctly")]
+		[InlineData(BorderStyle.Default, BorderStyle.Default)]
+		[InlineData(BorderStyle.Default, BorderStyle.None)]
+		[InlineData(BorderStyle.None, BorderStyle.Default)]
+		[InlineData(BorderStyle.None, BorderStyle.None)]
+		public async Task BorderStyleUpdatesCorrectly(BorderStyle setValue, BorderStyle unsetValue)
 		{
 			var entry = new EntryStub();
 
 			await ValidatePropertyUpdatesValue(
 				entry,
-				nameof(IEntry.HasBorder),
-				GetNativeHasBorder,
+				nameof(IEntry.BorderStyle),
+				GetNativeBorderStyle,
 				setValue,
 				unsetValue);
 		}
 
-		[Theory(DisplayName = "Updating HasBorder Does Not Affect Text")]
-		[InlineData(true, false)]
-		[InlineData(false, true)]
-		public async Task HasBorderDoesNotAffectText(bool initialHasBorder, bool newHasBorder)
+		[Theory(DisplayName = "Updating BorderStyle Does Not Affect Text")]
+		[InlineData(BorderStyle.Default, BorderStyle.None)]
+		[InlineData(BorderStyle.None, BorderStyle.Default)]
+		public async Task BorderStyleDoesNotAffectText(BorderStyle initialBorderStyle, BorderStyle newBorderStyle)
 		{
 			var entry = new EntryStub
 			{
 				Text = "Test Text",
-				HasBorder = initialHasBorder
+				BorderStyle = initialBorderStyle
 			};
 
 			await ValidateUnrelatedPropertyUnaffected(
 				entry,
 				GetNativeText,
-				nameof(IEntry.HasBorder),
-				() => entry.HasBorder = newHasBorder);
+				nameof(IEntry.BorderStyle),
+				() => entry.BorderStyle = newBorderStyle);
 		}
 
-		[Theory(DisplayName = "Updating HasBorder Does Not Affect TextColor")]
-		[InlineData(true, false)]
-		[InlineData(false, true)]
-		public async Task HasBorderDoesNotAffectTextColor(bool initialHasBorder, bool newHasBorder)
+		[Theory(DisplayName = "Updating BorderStyle Does Not Affect TextColor")]
+		[InlineData(BorderStyle.Default, BorderStyle.None)]
+		[InlineData(BorderStyle.None, BorderStyle.Default)]
+		public async Task BorderStyleDoesNotAffectTextColor(BorderStyle initialBorderStyle, BorderStyle newBorderStyle)
 		{
 			var entry = new EntryStub
 			{
 				Text = "Test",
 				TextColor = Colors.Red,
-				HasBorder = initialHasBorder
+				BorderStyle = initialBorderStyle
 			};
 
 			await ValidateUnrelatedPropertyUnaffected(
 				entry,
 				GetNativeTextColor,
-				nameof(IEntry.HasBorder),
-				() => entry.HasBorder = newHasBorder);
+				nameof(IEntry.BorderStyle),
+				() => entry.BorderStyle = newBorderStyle);
 		}
 
-		[Theory(DisplayName = "Updating HasBorder Does Not Affect Placeholder")]
-		[InlineData(true, false)]
-		[InlineData(false, true)]
-		public async Task HasBorderDoesNotAffectPlaceholder(bool initialHasBorder, bool newHasBorder)
+		[Theory(DisplayName = "Updating BorderStyle Does Not Affect Placeholder")]
+		[InlineData(BorderStyle.Default, BorderStyle.None)]
+		[InlineData(BorderStyle.None, BorderStyle.Default)]
+		public async Task BorderStyleDoesNotAffectPlaceholder(BorderStyle initialBorderStyle, BorderStyle newBorderStyle)
 		{
 			var entry = new EntryStub
 			{
 				Placeholder = "Enter text",
-				HasBorder = initialHasBorder
+				BorderStyle = initialBorderStyle
 			};
 
 			await ValidateUnrelatedPropertyUnaffected(
 				entry,
 				GetNativePlaceholder,
-				nameof(IEntry.HasBorder),
-				() => entry.HasBorder = newHasBorder);
+				nameof(IEntry.BorderStyle),
+				() => entry.BorderStyle = newBorderStyle);
 		}
 
-		[Theory(DisplayName = "Updating Text Does Not Affect HasBorder")]
+		[Theory(DisplayName = "Updating Text Does Not Affect BorderStyle")]
 		[InlineData("Short", "Longer Text")]
 		[InlineData("Long text here", "Short")]
-		public async Task TextDoesNotAffectHasBorder(string initialText, string newText)
+		public async Task TextDoesNotAffectBorderStyle(string initialText, string newText)
 		{
 			var entry = new EntryStub
 			{
 				Text = initialText,
-				HasBorder = true
+				BorderStyle = BorderStyle.Default
 			};
 
 			await ValidateUnrelatedPropertyUnaffected(
 				entry,
-				GetNativeHasBorder,
+				GetNativeBorderStyle,
 				nameof(IEntry.Text),
 				() => entry.Text = newText);
 		}
 
-		[Theory(DisplayName = "Updating TextColor Does Not Affect HasBorder")]
+		[Theory(DisplayName = "Updating TextColor Does Not Affect BorderStyle")]
 		[InlineData(0xFFFF0000, 0xFF0000FF)]
 		[InlineData(0xFF0000FF, 0xFFFF0000)]
-		public async Task TextColorDoesNotAffectHasBorder(uint setValue, uint unsetValue)
+		public async Task TextColorDoesNotAffectBorderStyle(uint setValue, uint unsetValue)
 		{
 			var entry = new EntryStub
 			{
 				Text = "Test",
-				HasBorder = true
+				BorderStyle = BorderStyle.Default
 			};
 
 			var setColor = Color.FromUint(setValue);
@@ -794,20 +794,20 @@ public async Task TextColorDoesNotAffectHasBorder(uint setValue, uint unsetValue
 
 			await ValidateUnrelatedPropertyUnaffected(
 				entry,
-				GetNativeHasBorder,
+				GetNativeBorderStyle,
 				nameof(IEntry.TextColor),
 				() => entry.TextColor = setColor);
 		}
 
-		[Theory(DisplayName = "HasBorder Works Correctly with Background")]
-		[InlineData(true)]
-		[InlineData(false)]
-		public async Task HasBorderWorksCorrectlyWithBackground(bool hasBorder)
+		[Theory(DisplayName = "BorderStyle Works Correctly with Background")]
+		[InlineData(BorderStyle.Default)]
+		[InlineData(BorderStyle.None)]
+		public async Task BorderStyleWorksCorrectlyWithBackground(BorderStyle borderStyle)
 		{
 			var entry = new EntryStub
 			{
 				Text = "Test",
-				HasBorder = hasBorder,
+				BorderStyle = borderStyle,
 				Background = new SolidPaintStub(Colors.Red)
 			};
 
@@ -816,7 +816,7 @@ await AttachAndRun(entry, async (handler) =>
 				await AssertEventually(() => handler.PlatformView.IsLoaded());
 			});
 
-			await ValidatePropertyInitValue(entry, () => entry.HasBorder, GetNativeHasBorder, hasBorder);
+			await ValidatePropertyInitValue(entry, () => entry.BorderStyle, GetNativeBorderStyle, borderStyle);
 
 			var hasBackground = await GetValueAsync(entry, handler =>
 			{
@@ -826,42 +826,42 @@ await AttachAndRun(entry, async (handler) =>
 			Assert.True(hasBackground);
 		}
 
-		[Theory(DisplayName = "Updating Background Does Not Affect HasBorder")]
-		[InlineData(true)]
-		[InlineData(false)]
-		public async Task BackgroundDoesNotAffectHasBorder(bool hasBorder)
+		[Theory(DisplayName = "Updating Background Does Not Affect BorderStyle")]
+		[InlineData(BorderStyle.Default)]
+		[InlineData(BorderStyle.None)]
+		public async Task BackgroundDoesNotAffectBorderStyle(BorderStyle borderStyle)
 		{
 			var entry = new EntryStub
 			{
 				Text = "Test",
-				HasBorder = hasBorder,
+				BorderStyle = borderStyle,
 				Background = new SolidPaintStub(Colors.Yellow)
 			};
 
 			await ValidateUnrelatedPropertyUnaffected(
 				entry,
-				GetNativeHasBorder,
+				GetNativeBorderStyle,
 				nameof(IEntry.Background),
 				() => entry.Background = new SolidPaintStub(Colors.Red));
 		}
 
-		[Theory(DisplayName = "Updating HasBorder Does Not Affect Background")]
-		[InlineData(true, false)]
-		[InlineData(false, true)]
-		public async Task HasBorderDoesNotAffectBackground(bool initialHasBorder, bool newHasBorder)
+		[Theory(DisplayName = "Updating BorderStyle Does Not Affect Background")]
+		[InlineData(BorderStyle.Default, BorderStyle.None)]
+		[InlineData(BorderStyle.None, BorderStyle.Default)]
+		public async Task BorderStyleDoesNotAffectBackground(BorderStyle initialBorderStyle, BorderStyle newBorderStyle)
 		{
 			var entry = new EntryStub
 			{
 				Text = "Test",
-				HasBorder = initialHasBorder,
+				BorderStyle = initialBorderStyle,
 				Background = new SolidPaintStub(Colors.Blue)
 			};
-			
+
 			await AttachAndRun(entry, async (handler) =>
 			{
 				await AssertEventually(() => handler.PlatformView.IsLoaded());
-				
-				entry.HasBorder = newHasBorder;
+
+				entry.BorderStyle = newBorderStyle;
 
 				Assert.NotNull(handler.PlatformView);
 			});
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
index 094cbcfb304e..d423b60b44cd 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
@@ -863,12 +863,12 @@ int GetNativeSelectionLength(EntryHandler entryHandler)
 
 			return -1;
 		}
-		
-		bool GetNativeHasBorder(EntryHandler entryHandler)
+
+		BorderStyle GetNativeBorderStyle(EntryHandler entryHandler)
 		{
 			var textField = GetNativeEntry(entryHandler);
 
-			return textField.BorderStyle == UITextBorderStyle.RoundedRect;
+			return textField.BorderStyle == UITextBorderStyle.RoundedRect ? BorderStyle.Default : BorderStyle.None;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
index 2f35184e486b..445a6131d5a3 100644
--- a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
@@ -29,7 +29,7 @@ public string Text
 
 		public bool IsReadOnly { get; set; }
 
-		public bool HasBorder { get; set; } = true;
+		public BorderStyle BorderStyle { get; set; } = true;
 
 		public Font Font { get; set; }
 

From c60c7949547eea70afbd189c3cada4482ea6de0d Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Rastegarinia <mh.rastegari@outlook.com>
Date: Tue, 2 Jun 2026 07:42:26 +0000
Subject: [PATCH 10/11] update netstandard mapper name

---
 src/Core/src/Handlers/Entry/EntryHandler.Standard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs b/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
index b6a9b920cf57..260b08a7c319 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
@@ -9,7 +9,7 @@ public partial class EntryHandler : ViewHandler<IEntry, object>
 		public static void MapText(IEntryHandler handler, IEntry entry) { }
 		public static void MapTextColor(IEntryHandler handler, IEntry entry) { }
 		public static void MapIsPassword(IEntryHandler handler, IEntry entry) { }
-		public static void MapHasBorder(IEntryHandler handler, IEntry entry) { }
+		public static void MapBorderStyle(IEntryHandler handler, IEntry entry) { }
 		public static void MapHorizontalTextAlignment(IEntryHandler handler, IEntry entry) { }
 		public static void MapVerticalTextAlignment(IEntryHandler handler, IEntry entry) { }
 

From 56a0df6989eb23713ccc6d6f612c79b65f35b580 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Rastegarinia <mh.rastegari@outlook.com>
Date: Wed, 3 Jun 2026 11:20:58 +0000
Subject: [PATCH 11/11] fix EntryStub

---
 src/Core/tests/DeviceTests/Stubs/EntryStub.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
index 445a6131d5a3..aa519db207e4 100644
--- a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
@@ -29,7 +29,7 @@ public string Text
 
 		public bool IsReadOnly { get; set; }
 
-		public BorderStyle BorderStyle { get; set; } = true;
+		public BorderStyle BorderStyle { get; set; } = BorderStyle.Default;
 
 		public Font Font { get; set; }