From bd997fce46331a15a09d90c3851700817647e117 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald@verslu.is>
Date: Mon, 5 May 2025 16:48:28 +0300
Subject: [PATCH] Revert "Remove InternalsVisibleTo for Toolkit (#28994)"

This reverts commit 504aa864f7ceab08da44ce185029c3a026440c9c.
---
 src/Controls/src/Core/ICornerElement.cs       | 25 +++----
 src/Controls/src/Core/ILineHeightElement.cs   | 32 +++------
 .../src/Core/ITextAlignmentElement.cs         | 41 +++--------
 src/Controls/src/Core/ITextElement.cs         | 71 +++++--------------
 .../src/Core/Properties/AssemblyInfo.cs       |  6 ++
 .../net-android/PublicAPI.Unshipped.txt       | 18 -----
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt | 18 -----
 .../net-maccatalyst/PublicAPI.Unshipped.txt   | 18 -----
 .../net-tizen/PublicAPI.Unshipped.txt         | 18 -----
 .../net-windows/PublicAPI.Unshipped.txt       | 18 -----
 .../PublicAPI/net/PublicAPI.Unshipped.txt     | 18 -----
 .../netstandard/PublicAPI.Unshipped.txt       | 18 -----
 .../src/Xaml/Properties/AssemblyInfo.cs       |  6 ++
 src/Core/src/Properties/AssemblyInfo.cs       |  5 ++
 .../src/AssemblyInfo/AssemblyInfo.shared.cs   |  5 ++
 15 files changed, 68 insertions(+), 249 deletions(-)

diff --git a/src/Controls/src/Core/ICornerElement.cs b/src/Controls/src/Core/ICornerElement.cs
index d3be53885010..8073bc34f00b 100644
--- a/src/Controls/src/Core/ICornerElement.cs
+++ b/src/Controls/src/Core/ICornerElement.cs
@@ -1,18 +1,9 @@
-namespace Microsoft.Maui.Controls;
-
-/// <summary>
-/// Defines properties for elements that can have rounded corners.
-/// </summary>
-/// <remarks>
-/// This interface is implemented by UI elements that support corner radius customization,
-/// allowing for consistent styling of corners across different controls.
-/// </remarks>
-public interface ICornerElement
+#nullable disable
+namespace Microsoft.Maui.Controls
 {
-	/// <summary>
-	/// Gets the radius for the corners of the element.
-	/// </summary>
-	/// <value>A <see cref="CornerRadius"/> value that specifies the radius for each corner of the element. The default value depends on the implementing control.</value>
-	/// <remarks>Implementors should implement this property publicly.</remarks>
-	CornerRadius CornerRadius { get; }
-}
+	interface ICornerElement
+	{
+		//note to implementor: implement this property publicly
+		CornerRadius CornerRadius { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ILineHeightElement.cs b/src/Controls/src/Core/ILineHeightElement.cs
index f81d26486548..1b4adab92a91 100644
--- a/src/Controls/src/Core/ILineHeightElement.cs
+++ b/src/Controls/src/Core/ILineHeightElement.cs
@@ -1,25 +1,13 @@
-namespace Microsoft.Maui.Controls;
+#nullable disable
+using System.ComponentModel;
 
-/// <summary>
-/// Defines properties and methods for elements that support line height customization.
-/// </summary>
-/// <remarks>
-/// This interface is implemented by UI elements that need to control the spacing between lines of text,
-/// providing consistent line height behavior across different text-based controls.
-/// </remarks>
-public interface ILineHeightElement
+namespace Microsoft.Maui.Controls.Internals
 {
-	/// <summary>
-	/// Gets the line height for text displayed by this element.
-	/// </summary>
-	/// <value>A multiplier that determines the spacing between lines of text. A value of 1.0 represents standard line height.</value>
-	double LineHeight { get; }
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	interface ILineHeightElement
+	{
+		double LineHeight { get; }
 
-	/// <summary>
-	/// Called when the <see cref="LineHeight"/> property changes.
-	/// </summary>
-	/// <param name="oldValue">The old value of the property.</param>
-	/// <param name="newValue">The new value of the property.</param>
-	/// <remarks>Implementors should implement this method explicitly.</remarks>
-	void OnLineHeightChanged(double oldValue, double newValue);
-}
+		void OnLineHeightChanged(double oldValue, double newValue);
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ITextAlignmentElement.cs b/src/Controls/src/Core/ITextAlignmentElement.cs
index 057ea79f14e6..bf0ccaab9bd2 100644
--- a/src/Controls/src/Core/ITextAlignmentElement.cs
+++ b/src/Controls/src/Core/ITextAlignmentElement.cs
@@ -1,33 +1,14 @@
-namespace Microsoft.Maui.Controls;
-
-/// <summary>
-/// Defines properties and methods for elements that support text alignment.
-/// </summary>
-/// <remarks>
-/// This interface is implemented by UI elements that need to control the horizontal and vertical 
-/// alignment of displayed text.
-/// </remarks>
-public interface ITextAlignmentElement
+#nullable disable
+namespace Microsoft.Maui.Controls
 {
-	/// <summary>
-	/// Gets the horizontal alignment of the text.
-	/// </summary>
-	/// <value>A <see cref="TextAlignment"/> value that specifies how the text is horizontally aligned. The default value depends on the implementing control.</value>
-	/// <remarks>Implementors should implement this property publicly.</remarks>
-	TextAlignment HorizontalTextAlignment { get; }
+	interface ITextAlignmentElement
+	{
+		//note to implementor: implement the properties publicly
+		TextAlignment HorizontalTextAlignment { get; }
 
-	/// <summary>
-	/// Gets the vertical alignment of the text.
-	/// </summary>
-	/// <value>A <see cref="TextAlignment"/> value that specifies how the text is vertically aligned. The default value depends on the implementing control.</value>
-	/// <remarks>Implementors should implement this property publicly.</remarks>
-	TextAlignment VerticalTextAlignment { get; }
+		TextAlignment VerticalTextAlignment { get; }
 
-	/// <summary>
-	/// Called when the <see cref="HorizontalTextAlignment"/> property changes.
-	/// </summary>
-	/// <param name="oldValue">The old value of the property.</param>
-	/// <param name="newValue">The new value of the property.</param>
-	/// <remarks>Implementors should implement this method explicitly.</remarks>
-	void OnHorizontalTextAlignmentPropertyChanged(TextAlignment oldValue, TextAlignment newValue);
-}
+		//note to implementor: but implement the methods explicitly
+		void OnHorizontalTextAlignmentPropertyChanged(TextAlignment oldValue, TextAlignment newValue);
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ITextElement.cs b/src/Controls/src/Core/ITextElement.cs
index 40c7600fb9b0..cf2de8e42104 100644
--- a/src/Controls/src/Core/ITextElement.cs
+++ b/src/Controls/src/Core/ITextElement.cs
@@ -1,64 +1,27 @@
 #nullable disable
+using System;
+using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
 
-namespace Microsoft.Maui.Controls;
-
-/// <summary>
-/// Defines properties and methods for elements that display text.
-/// </summary>
-/// <remarks>
-/// This interface is implemented by UI elements that can display text and allows consistent 
-/// text styling and formatting across different controls.
-/// </remarks>
-public interface ITextElement
+namespace Microsoft.Maui.Controls
 {
-	/// <summary>
-	/// Gets the color of the text.
-	/// </summary>
-	/// <value>The <see cref="Color"/> of the text. The default value depends on the implementing control.</value>
-	/// <remarks>Implementors should implement this property publicly.</remarks>
-	Color TextColor { get; }
+	interface ITextElement
+	{
+		//note to implementor: implement this property publicly
+		Color TextColor { get; }
 
-	/// <summary>
-	/// Called when the <see cref="TextColor"/> property changes.
-	/// </summary>
-	/// <param name="oldValue">The old value of the property.</param>
-	/// <param name="newValue">The new value of the property.</param>
-	/// <remarks>Implementors should implement this method explicitly.</remarks>
-	void OnTextColorPropertyChanged(Color oldValue, Color newValue);
+		//note to implementor: but implement this method explicitly
+		void OnTextColorPropertyChanged(Color oldValue, Color newValue);
 
-	/// <summary>
-	/// Gets the character spacing.
-	/// </summary>
-	/// <value>The spacing between characters in the text, in device-independent units. The default is 0.</value>
-	double CharacterSpacing { get; }
+		double CharacterSpacing { get; }
 
-	/// <summary>
-	/// Called when the <see cref="CharacterSpacing"/> property changes.
-	/// </summary>
-	/// <param name="oldValue">The old value of the property.</param>
-	/// <param name="newValue">The new value of the property.</param>
-	/// <remarks>Implementors should implement this method explicitly.</remarks>
-	void OnCharacterSpacingPropertyChanged(double oldValue, double newValue);
+		//note to implementor: but implement these methods explicitly
+		void OnCharacterSpacingPropertyChanged(double oldValue, double newValue);
 
-	/// <summary>
-	/// Gets or sets the text transformation.
-	/// </summary>
-	/// <value>A <see cref="TextTransform"/> value that indicates how the text is transformed. The default is <see cref="TextTransform.None"/>.</value>
-	TextTransform TextTransform { get; set; }
+		TextTransform TextTransform { get; set; }
 
-	/// <summary>
-	/// Called when the <see cref="TextTransform"/> property changes.
-	/// </summary>
-	/// <param name="oldValue">The old value of the property.</param>
-	/// <param name="newValue">The new value of the property.</param>
-	void OnTextTransformChanged(TextTransform oldValue, TextTransform newValue);
+		void OnTextTransformChanged(TextTransform oldValue, TextTransform newValue);
 
-	/// <summary>
-	/// Updates the text according to the specified transformation.
-	/// </summary>
-	/// <param name="original">The original text to transform.</param>
-	/// <param name="transform">The transformation to apply.</param>
-	/// <returns>The transformed text.</returns>
-	string UpdateFormsText(string original, TextTransform transform);
-}
+		string UpdateFormsText(string original, TextTransform transform);
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Properties/AssemblyInfo.cs b/src/Controls/src/Core/Properties/AssemblyInfo.cs
index 7c37bed62ffa..d77a424a110b 100644
--- a/src/Controls/src/Core/Properties/AssemblyInfo.cs
+++ b/src/Controls/src/Core/Properties/AssemblyInfo.cs
@@ -48,6 +48,12 @@
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.DeviceTests")]
 [assembly: InternalsVisibleTo("Controls.TestCases.HostApp")]
 
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Core")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Embedding")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.UnitTests")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup.UnitTests")]
 [assembly: InternalsVisibleTo("Controls.TestCases.HostApp")]
 
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
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 4ed6417f6313..27b332dfaa95 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -23,25 +23,7 @@ Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target) -> void
-Microsoft.Maui.Controls.ICornerElement
-Microsoft.Maui.Controls.ICornerElement.CornerRadius.get -> Microsoft.Maui.CornerRadius
-Microsoft.Maui.Controls.ILineHeightElement
-Microsoft.Maui.Controls.ILineHeightElement.LineHeight.get -> double
-Microsoft.Maui.Controls.ILineHeightElement.OnLineHeightChanged(double oldValue, double newValue) -> void
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
-Microsoft.Maui.Controls.ITextAlignmentElement
-Microsoft.Maui.Controls.ITextAlignmentElement.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement.VerticalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextElement
-Microsoft.Maui.Controls.ITextElement.CharacterSpacing.get -> double
-Microsoft.Maui.Controls.ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextElement.OnTextTransformChanged(Microsoft.Maui.TextTransform oldValue, Microsoft.Maui.TextTransform newValue) -> void
-Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTransform
-Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
-~Microsoft.Maui.Controls.ITextElement.OnTextColorPropertyChanged(Microsoft.Maui.Graphics.Color oldValue, Microsoft.Maui.Graphics.Color newValue) -> void
-~Microsoft.Maui.Controls.ITextElement.TextColor.get -> Microsoft.Maui.Graphics.Color
-~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.ShadowTypeConverter
 Microsoft.Maui.Controls.ShadowTypeConverter.ShadowTypeConverter() -> void
 Microsoft.Maui.Controls.StyleableElement.Style.get -> Microsoft.Maui.Controls.Style?
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 1ab494099c5b..8045f70def49 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -105,24 +105,6 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 *REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.set -> void
 Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target) -> void
-Microsoft.Maui.Controls.ICornerElement
-Microsoft.Maui.Controls.ICornerElement.CornerRadius.get -> Microsoft.Maui.CornerRadius
-Microsoft.Maui.Controls.ILineHeightElement
-Microsoft.Maui.Controls.ILineHeightElement.LineHeight.get -> double
-Microsoft.Maui.Controls.ILineHeightElement.OnLineHeightChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement
-Microsoft.Maui.Controls.ITextAlignmentElement.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement.VerticalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextElement
-Microsoft.Maui.Controls.ITextElement.CharacterSpacing.get -> double
-Microsoft.Maui.Controls.ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextElement.OnTextTransformChanged(Microsoft.Maui.TextTransform oldValue, Microsoft.Maui.TextTransform newValue) -> void
-Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTransform
-Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
-~Microsoft.Maui.Controls.ITextElement.OnTextColorPropertyChanged(Microsoft.Maui.Graphics.Color oldValue, Microsoft.Maui.Graphics.Color newValue) -> void
-~Microsoft.Maui.Controls.ITextElement.TextColor.get -> Microsoft.Maui.Graphics.Color
-~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 ~Microsoft.Maui.Controls.ResourceDictionary.SetAndCreateSource<T>(System.Uri value) -> void
 ~Microsoft.Maui.Controls.WebViewProcessTerminatedEventArgs.PlatformArgs.get -> Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs
 ~Microsoft.Maui.Controls.Xaml.IXamlTypeResolver.Resolve(string qualifiedTypeName, System.IServiceProvider serviceProvider = null, bool expandToExtension = true) -> System.Type
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 ffdce228b153..5c4527a13da9 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -105,24 +105,6 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 *REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.set -> void
 Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target) -> void
-Microsoft.Maui.Controls.ICornerElement
-Microsoft.Maui.Controls.ICornerElement.CornerRadius.get -> Microsoft.Maui.CornerRadius
-Microsoft.Maui.Controls.ILineHeightElement
-Microsoft.Maui.Controls.ILineHeightElement.LineHeight.get -> double
-Microsoft.Maui.Controls.ILineHeightElement.OnLineHeightChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement
-Microsoft.Maui.Controls.ITextAlignmentElement.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement.VerticalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextElement
-Microsoft.Maui.Controls.ITextElement.CharacterSpacing.get -> double
-Microsoft.Maui.Controls.ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextElement.OnTextTransformChanged(Microsoft.Maui.TextTransform oldValue, Microsoft.Maui.TextTransform newValue) -> void
-Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTransform
-Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
-~Microsoft.Maui.Controls.ITextElement.OnTextColorPropertyChanged(Microsoft.Maui.Graphics.Color oldValue, Microsoft.Maui.Graphics.Color newValue) -> void
-~Microsoft.Maui.Controls.ITextElement.TextColor.get -> Microsoft.Maui.Graphics.Color
-~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 ~Microsoft.Maui.Controls.ResourceDictionary.SetAndCreateSource<T>(System.Uri value) -> void
 ~Microsoft.Maui.Controls.Internals.TypedBindingBase.UpdateSourceEventName.set -> void
 ~Microsoft.Maui.Controls.Xaml.IXamlTypeResolver.Resolve(string qualifiedTypeName, System.IServiceProvider serviceProvider = null, bool expandToExtension = true) -> System.Type
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 01d0db218ec8..b87c5a3642af 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -23,25 +23,7 @@ Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target) -> void
-Microsoft.Maui.Controls.ICornerElement
-Microsoft.Maui.Controls.ICornerElement.CornerRadius.get -> Microsoft.Maui.CornerRadius
-Microsoft.Maui.Controls.ILineHeightElement
-Microsoft.Maui.Controls.ILineHeightElement.LineHeight.get -> double
-Microsoft.Maui.Controls.ILineHeightElement.OnLineHeightChanged(double oldValue, double newValue) -> void
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
-Microsoft.Maui.Controls.ITextAlignmentElement
-Microsoft.Maui.Controls.ITextAlignmentElement.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement.VerticalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextElement
-Microsoft.Maui.Controls.ITextElement.CharacterSpacing.get -> double
-Microsoft.Maui.Controls.ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextElement.OnTextTransformChanged(Microsoft.Maui.TextTransform oldValue, Microsoft.Maui.TextTransform newValue) -> void
-Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTransform
-Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
-~Microsoft.Maui.Controls.ITextElement.OnTextColorPropertyChanged(Microsoft.Maui.Graphics.Color oldValue, Microsoft.Maui.Graphics.Color newValue) -> void
-~Microsoft.Maui.Controls.ITextElement.TextColor.get -> Microsoft.Maui.Graphics.Color
-~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.ShadowTypeConverter
 Microsoft.Maui.Controls.ShadowTypeConverter.ShadowTypeConverter() -> void
 Microsoft.Maui.Controls.StyleableElement.Style.get -> Microsoft.Maui.Controls.Style?
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 38a349339253..b85afc7ab6a2 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -23,25 +23,7 @@ Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target) -> void
-Microsoft.Maui.Controls.ICornerElement
-Microsoft.Maui.Controls.ICornerElement.CornerRadius.get -> Microsoft.Maui.CornerRadius
-Microsoft.Maui.Controls.ILineHeightElement
-Microsoft.Maui.Controls.ILineHeightElement.LineHeight.get -> double
-Microsoft.Maui.Controls.ILineHeightElement.OnLineHeightChanged(double oldValue, double newValue) -> void
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
-Microsoft.Maui.Controls.ITextAlignmentElement
-Microsoft.Maui.Controls.ITextAlignmentElement.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement.VerticalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextElement
-Microsoft.Maui.Controls.ITextElement.CharacterSpacing.get -> double
-Microsoft.Maui.Controls.ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextElement.OnTextTransformChanged(Microsoft.Maui.TextTransform oldValue, Microsoft.Maui.TextTransform newValue) -> void
-Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTransform
-Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
-~Microsoft.Maui.Controls.ITextElement.OnTextColorPropertyChanged(Microsoft.Maui.Graphics.Color oldValue, Microsoft.Maui.Graphics.Color newValue) -> void
-~Microsoft.Maui.Controls.ITextElement.TextColor.get -> Microsoft.Maui.Graphics.Color
-~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 override Microsoft.Maui.Controls.Handlers.Items.SelectableItemsViewHandler<TItemsView>.UpdateItemsLayout() -> void
 Microsoft.Maui.Controls.ShadowTypeConverter
 Microsoft.Maui.Controls.ShadowTypeConverter.ShadowTypeConverter() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 8038f482493d..11835a7df105 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -23,25 +23,7 @@ Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target) -> void
-Microsoft.Maui.Controls.ICornerElement
-Microsoft.Maui.Controls.ICornerElement.CornerRadius.get -> Microsoft.Maui.CornerRadius
-Microsoft.Maui.Controls.ILineHeightElement
-Microsoft.Maui.Controls.ILineHeightElement.LineHeight.get -> double
-Microsoft.Maui.Controls.ILineHeightElement.OnLineHeightChanged(double oldValue, double newValue) -> void
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
-Microsoft.Maui.Controls.ITextAlignmentElement
-Microsoft.Maui.Controls.ITextAlignmentElement.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement.VerticalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextElement
-~Microsoft.Maui.Controls.ITextElement.OnTextColorPropertyChanged(Microsoft.Maui.Graphics.Color oldValue, Microsoft.Maui.Graphics.Color newValue) -> void
-~Microsoft.Maui.Controls.ITextElement.TextColor.get -> Microsoft.Maui.Graphics.Color
-~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
-Microsoft.Maui.Controls.ITextElement.CharacterSpacing.get -> double
-Microsoft.Maui.Controls.ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextElement.OnTextTransformChanged(Microsoft.Maui.TextTransform oldValue, Microsoft.Maui.TextTransform newValue) -> void
-Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTransform
-Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 Microsoft.Maui.Controls.ShadowTypeConverter
 Microsoft.Maui.Controls.ShadowTypeConverter.ShadowTypeConverter() -> void
 Microsoft.Maui.Controls.StyleableElement.Style.get -> Microsoft.Maui.Controls.Style?
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 99da32f9d634..b91292a84baf 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -23,22 +23,7 @@ Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
 Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target) -> void
-Microsoft.Maui.Controls.ICornerElement
-Microsoft.Maui.Controls.ICornerElement.CornerRadius.get -> Microsoft.Maui.CornerRadius
-Microsoft.Maui.Controls.ILineHeightElement
-Microsoft.Maui.Controls.ILineHeightElement.LineHeight.get -> double
-Microsoft.Maui.Controls.ILineHeightElement.OnLineHeightChanged(double oldValue, double newValue) -> void
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
-Microsoft.Maui.Controls.ITextAlignmentElement
-Microsoft.Maui.Controls.ITextAlignmentElement.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
-Microsoft.Maui.Controls.ITextAlignmentElement.VerticalTextAlignment.get -> Microsoft.Maui.TextAlignment
-Microsoft.Maui.Controls.ITextElement
-Microsoft.Maui.Controls.ITextElement.CharacterSpacing.get -> double
-Microsoft.Maui.Controls.ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newValue) -> void
-Microsoft.Maui.Controls.ITextElement.OnTextTransformChanged(Microsoft.Maui.TextTransform oldValue, Microsoft.Maui.TextTransform newValue) -> void
-Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTransform
-Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 Microsoft.Maui.Controls.ShadowTypeConverter
 Microsoft.Maui.Controls.ShadowTypeConverter.ShadowTypeConverter() -> void
 Microsoft.Maui.Controls.StyleableElement.Style.get -> Microsoft.Maui.Controls.Style?
@@ -46,9 +31,6 @@ override Microsoft.Maui.Controls.ShadowTypeConverter.CanConvertFrom(System.Compo
 override Microsoft.Maui.Controls.ShadowTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.ShadowTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object!
 override Microsoft.Maui.Controls.ShadowTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type? destinationType) -> object!
-~Microsoft.Maui.Controls.ITextElement.OnTextColorPropertyChanged(Microsoft.Maui.Graphics.Color oldValue, Microsoft.Maui.Graphics.Color newValue) -> void
-~Microsoft.Maui.Controls.ITextElement.TextColor.get -> Microsoft.Maui.Graphics.Color
-~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, Microsoft.Maui.FlowDirection flowDirection, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayAlertAsync(string title, string message, string accept, string cancel) -> System.Threading.Tasks.Task<bool>
diff --git a/src/Controls/src/Xaml/Properties/AssemblyInfo.cs b/src/Controls/src/Xaml/Properties/AssemblyInfo.cs
index 32c270a08b9c..4d97e5e3d5dc 100644
--- a/src/Controls/src/Xaml/Properties/AssemblyInfo.cs
+++ b/src/Controls/src/Xaml/Properties/AssemblyInfo.cs
@@ -11,6 +11,12 @@
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.HotReload.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.SourceGen")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Core")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Embedding")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.UnitTests")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.DeviceTests")]
 [assembly: Preserve]
 
diff --git a/src/Core/src/Properties/AssemblyInfo.cs b/src/Core/src/Properties/AssemblyInfo.cs
index b1b293cce36e..eb1db1dee35d 100644
--- a/src/Core/src/Properties/AssemblyInfo.cs
+++ b/src/Core/src/Properties/AssemblyInfo.cs
@@ -32,6 +32,11 @@
 [assembly: InternalsVisibleTo("Core.Benchmarks")]
 [assembly: InternalsVisibleTo("Comet")]
 [assembly: InternalsVisibleTo("Comet.Tests")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Core")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.UnitTests")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup.UnitTests")]
 [assembly: InternalsVisibleTo("Reloadify-emit")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.TestUtils.DeviceTests.Runners")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.TestUtils.DeviceTests")]
diff --git a/src/Essentials/src/AssemblyInfo/AssemblyInfo.shared.cs b/src/Essentials/src/AssemblyInfo/AssemblyInfo.shared.cs
index 82df4244e7e7..4a4ab0f715e2 100644
--- a/src/Essentials/src/AssemblyInfo/AssemblyInfo.shared.cs
+++ b/src/Essentials/src/AssemblyInfo/AssemblyInfo.shared.cs
@@ -7,6 +7,11 @@
 [assembly: InternalsVisibleTo("EssentialsDeviceTestsUWP")]
 [assembly: InternalsVisibleTo("EssentialsDeviceTestsShared")]
 [assembly: InternalsVisibleTo("EssentialsDeviceTestsiOS")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Core")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.UnitTests")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup")]
+[assembly: InternalsVisibleTo("CommunityToolkit.Maui.Markup.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Core.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Xaml.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Compatibility.Core.UnitTests")]