Merge branch 'master' into master

src/Avalonia.Base/Animation/AnimatorKeyFrame.cs

@@ -67,7 +67,7 @@ namespace Avalonia.Animation
             }
         }
 
-        [RequiresUnreferencedCode(TrimmingMessages.TypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.TypeConversionRequiresUnreferencedCodeMessage)]
         public T GetTypedValue<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>()
         {
             var typeConv = TypeDescriptor.GetConverter(typeof(T));

src/Avalonia.Base/AvaloniaProperty.cs

@@ -476,7 +476,7 @@ namespace Avalonia
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>True if the value is valid, otherwise false.</returns>
-        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConversionRequiresUnreferencedCodeMessage)]
         public bool IsValidValue(object? value)
         {
             return TypeUtilities.TryConvertImplicit(PropertyType, value, out _);

src/Avalonia.Base/AvaloniaProperty`1.cs

@@ -70,7 +70,7 @@ namespace Avalonia
 
         private protected override IObservable<AvaloniaPropertyChangedEventArgs> GetChanged() => Changed;
 
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConversionSupressWarningMessage)]
         private protected BindingValue<object?> TryConvert(object? value)
         {
             if (value == UnsetValue)

src/Avalonia.Base/Collections/AvaloniaListConverter.cs

@@ -9,7 +9,7 @@ namespace Avalonia.Collections
     /// <summary>
     /// Creates an <see cref="AvaloniaList{T}"/> from a string representation.
     /// </summary>
-    [RequiresUnreferencedCode(TrimmingMessages.TypeConvertionRequiresUnreferencedCodeMessage)]
+    [RequiresUnreferencedCode(TrimmingMessages.TypeConversionRequiresUnreferencedCodeMessage)]
     public class AvaloniaListConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T> : TypeConverter
     {
         public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)

src/Avalonia.Base/Data/BindingValue.cs

@@ -237,7 +237,7 @@ namespace Avalonia.Data
         /// </summary>
         /// <param name="value">The untyped value.</param>
         /// <returns>The typed binding value.</returns>
-        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConversionRequiresUnreferencedCodeMessage)]
         public static BindingValue<T> FromUntyped(object? value)
         {
             return FromUntyped(value, typeof(T));
@@ -251,7 +251,7 @@ namespace Avalonia.Data
         /// <param name="value">The untyped value.</param>
         /// <param name="targetType">The runtime target type.</param>
         /// <returns>The typed binding value.</returns>
-        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConversionRequiresUnreferencedCodeMessage)]
         public static BindingValue<T> FromUntyped(object? value, Type targetType)
         {
             if (value == AvaloniaProperty.UnsetValue)

src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs

@@ -10,7 +10,7 @@ namespace Avalonia.Data.Converters
     /// Provides a default set of value conversions for bindings that do not specify a value
     /// converter.
     /// </summary>
-    [RequiresUnreferencedCode(TrimmingMessages.TypeConvertionRequiresUnreferencedCodeMessage)]
+    [RequiresUnreferencedCode(TrimmingMessages.TypeConversionRequiresUnreferencedCodeMessage)]
     public class DefaultValueConverter : IValueConverter
     {
         /// <summary>

src/Avalonia.Base/Data/Core/BindingExpression.cs

@@ -12,7 +12,7 @@ namespace Avalonia.Data.Core
     /// Binds to an expression on an object using a type value converter to convert the values
     /// that are sent and received.
     /// </summary>
-    [RequiresUnreferencedCode(TrimmingMessages.TypeConvertionRequiresUnreferencedCodeMessage)]
+    [RequiresUnreferencedCode(TrimmingMessages.TypeConversionRequiresUnreferencedCodeMessage)]
     internal class BindingExpression : LightweightObservableBase<object?>, IAvaloniaSubject<object?>, IDescription
     {
         private readonly ExpressionObserver _inner;

src/Avalonia.Base/Diagnostics/TrimmingMessages.cs

@@ -2,11 +2,11 @@
 
 internal static class TrimmingMessages
 {
-    public const string ImplicitTypeConvertionSupressWarningMessage = "Implicit convertion methods might be removed by the linker. We don't have a reliable way to prevent it, except converting everything in compile time when possible.";
+    public const string ImplicitTypeConversionSupressWarningMessage = "Implicit conversion methods might be removed by the linker. We don't have a reliable way to prevent it, except converting everything in compile time when possible.";
-    public const string ImplicitTypeConvertionRequiresUnreferencedCodeMessage = "Implicit convertion methods are required for type conversion.";
+    public const string ImplicitTypeConversionRequiresUnreferencedCodeMessage = "Implicit conversion methods are required for type conversion.";
 
-    public const string TypeConvertionSupressWarningMessage = "Convertion methods might be removed by the linker. We don't have a reliable way to prevent it, except converting everything in compile time when possible.";
+    public const string TypeConversionSupressWarningMessage = "Conversion methods might be removed by the linker. We don't have a reliable way to prevent it, except converting everything in compile time when possible.";
-    public const string TypeConvertionRequiresUnreferencedCodeMessage = "Convertion methods are required for type conversion, including op_Implicit, op_Explicit, Parse and TypeConverter.";
+    public const string TypeConversionRequiresUnreferencedCodeMessage = "Conversion methods are required for type conversion, including op_Implicit, op_Explicit, Parse and TypeConverter.";
 
     public const string ReflectionBindingRequiresUnreferencedCodeMessage = "BindingExpression and ReflectionBinding heavily use reflection. Consider using CompiledBindings instead.";
     public const string ReflectionBindingSupressWarningMessage = "BindingExpression and ReflectionBinding internal heavily use reflection.";

src/Avalonia.Base/Properties/AssemblyInfo.cs

@@ -6,6 +6,7 @@ using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data.Converters")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input.GestureRecognizers")]

src/Avalonia.Base/PropertyStore/DirectUntypedBindingObserver.cs

@@ -5,7 +5,7 @@ using Avalonia.Threading;
 
 namespace Avalonia.PropertyStore
 {
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConversionSupressWarningMessage)]
     internal class DirectUntypedBindingObserver<T> : IObserver<object?>,
         IDisposable
     {

src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs

@@ -14,7 +14,7 @@ namespace Avalonia.PropertyStore
 
         public void Start(IObservable<object?> source) => _subscription = source.Subscribe(this);
 
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConversionSupressWarningMessage)]
         public void OnNext(object? value)
         {
             if (value == BindingOperations.DoNothing)

src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs

@@ -7,7 +7,7 @@ namespace Avalonia.PropertyStore
 {
     internal static class UntypedValueUtils
     {
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConversionSupressWarningMessage)]
         public static BindingValue<T> ConvertAndValidate<T>(
             object? value,
             Type targetType,
@@ -24,7 +24,7 @@ namespace Avalonia.PropertyStore
             return v;
         }
 
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConversionSupressWarningMessage)]
         public static bool TryConvertAndValidate<T>(
             StyledProperty<T> property,
             object? value, 

src/Avalonia.Base/StyledProperty.cs

@@ -221,7 +221,7 @@ namespace Avalonia
             return target.Bind<TValue>(this, source, priority);
         }
 
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConversionSupressWarningMessage)]
         private bool ShouldSetValue(AvaloniaObject target, object? value, [NotNullWhen(true)] out TValue? converted)
         {
             if (value == BindingOperations.DoNothing)

src/Avalonia.Base/Styling/PropertyEqualsSelector.cs

@@ -91,8 +91,8 @@ namespace Avalonia.Styling
         private protected override Selector? MovePrevious() => _previous;
         private protected override Selector? MovePreviousOrParent() => _previous;
 
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.TypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.TypeConversionSupressWarningMessage)]
-        [UnconditionalSuppressMessage("Trimming", "IL2067", Justification = TrimmingMessages.TypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2067", Justification = TrimmingMessages.TypeConversionSupressWarningMessage)]
         internal static bool Compare(Type propertyType, object? propertyValue, object? value)
         {
             if (propertyType == typeof(object) &&

src/Avalonia.Base/Styling/Setter.cs

@@ -65,7 +65,7 @@ namespace Avalonia.Styling
 
         void IValueEntry.Unsubscribe() { }
 
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConversionSupressWarningMessage)]
         internal override ISetterInstance Instance(IStyleInstance instance, StyledElement target)
         {
             if (target is not AvaloniaObject ao)

src/Avalonia.Base/Utilities/TypeUtilities.cs

@@ -126,7 +126,7 @@ namespace Avalonia.Utilities
         /// <param name="culture">The culture to use.</param>
         /// <param name="result">If successful, contains the convert value.</param>
         /// <returns>True if the cast was successful, otherwise false.</returns>
-        [RequiresUnreferencedCode(TrimmingMessages.TypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.TypeConversionRequiresUnreferencedCodeMessage)]
         public static bool TryConvert(Type to, object? value, CultureInfo? culture, out object? result)
         {
             if (value == null)
@@ -246,7 +246,7 @@ namespace Avalonia.Utilities
         /// <param name="value">The value to convert.</param>
         /// <param name="result">If successful, contains the converted value.</param>
         /// <returns>True if the convert was successful, otherwise false.</returns>
-        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConversionRequiresUnreferencedCodeMessage)]
         public static bool TryConvertImplicit(Type to, object? value, out object? result)
         {
             if (value == null)
@@ -309,7 +309,7 @@ namespace Avalonia.Utilities
         /// <param name="type">The type to convert to..</param>
         /// <param name="culture">The culture to use.</param>
         /// <returns>A value of <paramref name="type"/>.</returns>
-        [RequiresUnreferencedCode(TrimmingMessages.TypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.TypeConversionRequiresUnreferencedCodeMessage)]
         public static object? ConvertOrDefault(object? value, Type type, CultureInfo culture)
         {
             return TryConvert(type, value, culture, out var result) ? result : Default(type);
@@ -322,13 +322,13 @@ namespace Avalonia.Utilities
         /// <param name="value">The value to convert.</param>
         /// <param name="type">The type to convert to.</param>
         /// <returns>A value of <paramref name="type"/>.</returns>
-        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConversionRequiresUnreferencedCodeMessage)]
         public static object? ConvertImplicitOrDefault(object? value, Type type)
         {
             return TryConvertImplicit(type, value, out var result) ? result : Default(type);
         }
 
-        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConvertionRequiresUnreferencedCodeMessage)]
+        [RequiresUnreferencedCode(TrimmingMessages.ImplicitTypeConversionRequiresUnreferencedCodeMessage)]
         public static T ConvertImplicit<T>(object? value)
         {
             if (TryConvertImplicit(typeof(T), value, out var result))

src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs

@@ -4,7 +4,7 @@ using Avalonia.Diagnostics.ViewModels;
 
 namespace Avalonia.Diagnostics.Models
 {
-    public class ConsoleContext
+    internal class ConsoleContext
     {
         private readonly ConsoleViewModel _owner;
 

src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj

@@ -71,6 +71,8 @@
   <Import Project="..\..\..\build\NullableEnable.props" />
 
   <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Designer.HostApp, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Markup.Xaml.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
   </ItemGroup>
 </Project>

src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs

@@ -9,7 +9,7 @@ namespace Avalonia.Markup.Xaml
     /// </summary>
     public static class AvaloniaXamlLoader
     {
-        public interface IRuntimeXamlLoader
+        internal interface IRuntimeXamlLoader
         {
             object Load(RuntimeXamlLoaderDocument document, RuntimeXamlLoaderConfiguration configuration);
         }

src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs

@@ -173,7 +173,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
         public CompiledBindingPath Build() => new CompiledBindingPath(_elements.ToArray(), _rawSource);
     }
 
-    public interface ICompiledBindingPathElement
+    internal interface ICompiledBindingPathElement
     {
     }
 

src/Markup/Avalonia.Markup/Avalonia.Markup.csproj

@@ -19,7 +19,13 @@
   <Import Project="..\..\..\build\TrimmingEnable.props" />
 
   <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Base.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Benchmarks, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Designer.HostApp, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Markup.Xaml, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml.Loader, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Markup.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
   </ItemGroup>
 </Project>

src/Markup/Avalonia.Markup/Data/BindingBase.cs

@@ -76,7 +76,7 @@ namespace Avalonia.Data
             bool enableDataValidation);
 
         /// <inheritdoc/>
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.TypeConvertionSupressWarningMessage)]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.TypeConversionSupressWarningMessage)]
         public InstancedBinding? Initiate(
             AvaloniaObject target,
             AvaloniaProperty? targetProperty,
@@ -234,7 +234,7 @@ namespace Avalonia.Data
             return result;
         }
 
-        protected IObservable<object?> GetParentDataContext(AvaloniaObject target)
+        private IObservable<object?> GetParentDataContext(AvaloniaObject target)
         {
             // The DataContext is based on the visual parent and not the logical parent: this may
             // seem counter intuitive considering the fact that property inheritance works on the logical

src/Markup/Avalonia.Markup/Markup/Data/DelayedBinding.cs

@@ -18,7 +18,7 @@ namespace Avalonia.Markup.Data
     /// is applied to the property before the properties on the `Binding` object are set. Looking 
     /// at WPF it uses a similar mechanism for bindings that come from XAML.
     /// </remarks>
-    public static class DelayedBinding
+    internal static class DelayedBinding
     {
         private static readonly ConditionalWeakTable<StyledElement, List<Entry>> _entries = new();
 

src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs

@@ -4,10 +4,7 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Markup.Parsers
 {
-#if !BUILDTASK
+    internal static class ArgumentListParser
-    public
-#endif
-    static class ArgumentListParser
     {
         public static IList<string> ParseArguments(this ref CharacterReader r, char open, char close, char delimiter = ',')
         {

src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs

@@ -7,10 +7,7 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Markup.Parsers
 {
-#if !BUILDTASK
+    internal class PropertyPathGrammar
-    public
-#endif
-    class PropertyPathGrammar
     {
         private enum State
         {

src/Markup/Avalonia.Markup/Markup/Parsers/SelectorParser.cs

@@ -11,7 +11,7 @@ namespace Avalonia.Markup.Parsers
     /// <summary>
     /// Parses a <see cref="Selector"/> from text.
     /// </summary>
-    public class SelectorParser
+    internal class SelectorParser
     {
         private readonly Func<string, string, Type> _typeResolver;
 

tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs

@@ -13,7 +13,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
         public XamlTestBase()
         {
             // Ensure necessary assemblies are loaded.
-            var _ = typeof(TemplateBinding);
+            var _ = typeof(Binding);
             GC.KeepAlive(typeof(ItemsRepeater));
             if (AvaloniaLocator.Current.GetService<AvaloniaXamlLoader.IRuntimeXamlLoader>() == null)
                 AvaloniaLocator.CurrentMutable.Bind<AvaloniaXamlLoader.IRuntimeXamlLoader>()